Address PMD finding; Migrate joiner API usage

newtork · newtork · commit 0ecbe6929110 · 2025-07-31T14:31:57.000+02:00
diff --git a/cloudplatform/cloudplatform-core/src/main/java/com/sap/cloud/sdk/cloudplatform/util/StringUtils.java b/cloudplatform/cloudplatform-core/src/main/java/com/sap/cloud/sdk/cloudplatform/util/StringUtils.java
@@ -101,7 +101,7 @@ public static String removeEndIgnoreCase( @Nonnull final String s, @Nonnull fina
      */
     public static boolean isBlankOrEmpty( @Nullable final String s )
     {
-        return s == null || s.trim().isEmpty();
+        return s == null || s.isBlank();
     }
 
     /**
@@ -156,9 +156,9 @@ public static String uncapitalize( @Nonnull final String s )
      * @return the trimmed string, or null if the input is null or empty after trimming
      */
     @Nullable
-    public static String trimToNull( @Nullable String s )
+    public static String trimToNull( final @Nullable String s )
     {
-        return s == null ? null : (s = s.trim()).isEmpty() ? null : s;
+        return isBlankOrEmpty(s) ? null : s.trim();
     }
 
     /**
diff --git a/cloudplatform/connectivity-apache-httpclient4/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/HttpClientWrapper.java b/cloudplatform/connectivity-apache-httpclient4/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/HttpClientWrapper.java
@@ -16,7 +16,6 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.protocol.HttpContext;
 
-import com.google.common.base.Joiner;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
 import com.sap.cloud.sdk.cloudplatform.exception.ShouldNotHappenException;
 
@@ -114,7 +113,7 @@ public URI mergeRequestUri( @Nonnull final URI requestUri )
         final UriPathMerger merger = new UriPathMerger();
         final URI mergedUri = merger.merge(destination.getUri(), requestUri);
 
-        final String queryString = Joiner.on("&").join(QueryParamGetter.getQueryParameters(destination));
+        final String queryString = String.join("&", QueryParamGetter.getQueryParameters(destination));
         return merger.merge(mergedUri, URI.create("/?" + queryString));
     }
 
diff --git a/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Wrapper.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Wrapper.java
@@ -15,7 +15,6 @@
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.io.CloseMode;
 
-import com.google.common.base.Joiner;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
 import com.sap.cloud.sdk.cloudplatform.exception.ShouldNotHappenException;
 
@@ -103,7 +102,7 @@ ClassicHttpRequest wrapRequest( final ClassicHttpRequest request )
             throw new IllegalStateException("Failed to merge destination URI with request URI.", e);
         }
 
-        final String queryString = Joiner.on("&").join(QueryParamGetter.getQueryParameters(destination));
+        final String queryString = String.join("&", QueryParamGetter.getQueryParameters(destination));
         requestUri = merger.merge(requestUri, URI.create("/?" + queryString));
 
         final ClassicRequestBuilder requestBuilder = ClassicRequestBuilder.copy(request);
diff --git a/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/query/QuerySerializer.java b/datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/query/QuerySerializer.java
@@ -10,7 +10,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
 import com.sap.cloud.sdk.datamodel.odata.client.expression.OrderExpression;
@@ -57,7 +56,7 @@ static String serializeAndEncodeQuery( @Nonnull final StructuredQuery query, fin
         }
 
         final String queryElementSeparator = query.isRoot() ? SEPARATOR_ROOT_QUERY : SEPARATOR_SUB_QUERY;
-        return Joiner.on(queryElementSeparator).join(parameters);
+        return String.join(queryElementSeparator, parameters);
     }
 
     /**
@@ -69,7 +68,7 @@ static String serializeAndEncodeQuery( @Nonnull final StructuredQuery query, fin
     private static String selectorsToQueryString( @Nonnull final StructuredQuery q, final boolean applyEncoding )
     {
         final List<String> selectors = getSelectors(q, applyEncoding);
-        return Joiner.on(",").join(selectors);
+        return String.join(",", selectors);
     }
 
     /**
@@ -117,7 +116,7 @@ private static List<String> getSelectors( @Nonnull final StructuredQuery query,
     private static String expansionsToQueryString( @Nonnull final StructuredQuery q, final boolean applyEncoding )
     {
         final List<String> filters = getExpansions(q, applyEncoding);
-        return Joiner.on(",").join(filters);
+        return String.join(",", filters);
     }
 
     /**
@@ -169,7 +168,7 @@ private static String filtersToQueryString( @Nonnull final StructuredQuery q, fi
         final List<String> filters =
             q.getFilters().stream().map(filter -> filter.getExpression(q.getProtocol())).collect(Collectors.toList());
 
-        return conditionalEncode(Joiner.on(" and ").join(filters), applyEncoding);
+        return conditionalEncode(String.join(" and ", filters), applyEncoding);
     }
 
     /**
diff --git a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java
@@ -15,8 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.google.common.base.Joiner;
-
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -105,7 +103,7 @@ public Optional<String> getString( @Nonnull final String key )
      */
     public void putString( @Nonnull final String key, @Nonnull final String value, @Nonnull final String... comments )
     {
-        mappings.put(new Key(key), new Value(value, Joiner.on(" ").join(comments)));
+        mappings.put(new Key(key), new Value(value, String.join(" ", comments)));
     }
 
     private void populateMappings()
diff --git a/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/JavadocUtils.java b/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/JavadocUtils.java
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.sun.codemodel.JDefinedClass;
 import com.sun.codemodel.JDocComment;
@@ -121,7 +120,7 @@ static String getConstraints( final Service.Element element )
         }
 
         if( !parameterFacetsStrings.isEmpty() ) {
-            parameterConstraintsString += Joiner.on(", ").join(parameterFacetsStrings);
+            parameterConstraintsString += String.join(", ", parameterFacetsStrings);
         } else {
             parameterConstraintsString += "none";
         }
diff --git a/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ServiceClassGenerator.java b/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ServiceClassGenerator.java
@@ -11,7 +11,6 @@
 import javax.annotation.Nullable;
 
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.escape.Escaper;
 import com.google.common.html.HtmlEscapers;
@@ -143,7 +142,7 @@ private void addClassLevelJavadoc( final JDocComment javadoc, final Service serv
                                 .format(
                                     "<tr><td align='right'>%s:</td><td>%s</td></tr>",
                                     entry.getName(),
-                                    Joiner.on(", ").join(entry.getValues())));
+                                    String.join(", ", entry.getValues())));
                 }
             }
         }
diff --git a/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ServicePathTest.java b/datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ServicePathTest.java
@@ -32,7 +32,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -274,7 +273,7 @@ private static String createPayloadSingle( final String payload )
 
     private static String createPayloadMultiple( final String... payloads )
     {
-        return createPayloadSingle(format("{\"results\":[%s]}", Joiner.on(',').join(payloads)));
+        return createPayloadSingle(format("{\"results\":[%s]}", String.join(",", payloads)));
     }
 
     private static String createTestEntity( final String id, final String rel )
diff --git a/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/JavadocUtils.java b/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/JavadocUtils.java
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.sun.codemodel.JDefinedClass;
 import com.sun.codemodel.JDocComment;
@@ -139,7 +138,7 @@ static String getConstraints( final Service.Element edmElement )
         }
 
         if( !parameterFacetsStrings.isEmpty() ) {
-            parameterConstraintsString += Joiner.on(", ").join(parameterFacetsStrings);
+            parameterConstraintsString += String.join(", ", parameterFacetsStrings);
         } else {
             parameterConstraintsString += "none";
         }
diff --git a/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ServiceClassGenerator.java b/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ServiceClassGenerator.java
@@ -9,7 +9,6 @@
 import javax.annotation.Nullable;
 
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.escape.Escaper;
 import com.google.common.html.HtmlEscapers;
@@ -128,7 +127,7 @@ private void addClassLevelJavadoc( final JDocComment javadoc, final Service serv
                                 .format(
                                     "<tr><td align='right'>%s:</td><td>%s</td></tr>",
                                     entry.getName(),
-                                    Joiner.on(", ").join(entry.getValues())));
+                                    String.join(", ", entry.getValues())));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public static String removeEndIgnoreCase( @Nonnull final String s, @Nonnull fina`
`101`	`101`	`*/`
`102`	`102`	`public static boolean isBlankOrEmpty( @Nullable final String s )`
`103`	`103`	`{`
`104`		`- return s == null \|\| s.trim().isEmpty();`
	`104`	`+ return s == null \|\| s.isBlank();`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/**`
`@@ -156,9 +156,9 @@ public static String uncapitalize( @Nonnull final String s )`
`156`	`156`	`* @return the trimmed string, or null if the input is null or empty after trimming`
`157`	`157`	`*/`
`158`	`158`	`@Nullable`
`159`		`- public static String trimToNull( @Nullable String s )`
	`159`	`+ public static String trimToNull( final @Nullable String s )`
`160`	`160`	`{`
`161`		`- return s == null ? null : (s = s.trim()).isEmpty() ? null : s;`
	`161`	`+ return isBlankOrEmpty(s) ? null : s.trim();`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import javax.annotation.Nonnull;`
`11`	`11`	`import javax.annotation.Nullable;`
`12`	`12`
`13`		`-import com.google.common.base.Joiner;`
`14`	`13`	`import com.google.common.collect.ImmutableMap;`
`15`	`14`	`import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;`
`16`	`15`	`import com.sap.cloud.sdk.datamodel.odata.client.expression.OrderExpression;`
`@@ -57,7 +56,7 @@ static String serializeAndEncodeQuery( @Nonnull final StructuredQuery query, fin`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`final String queryElementSeparator = query.isRoot() ? SEPARATOR_ROOT_QUERY : SEPARATOR_SUB_QUERY;`
`60`		`- return Joiner.on(queryElementSeparator).join(parameters);`
	`59`	`+ return String.join(queryElementSeparator, parameters);`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`/**`
`@@ -69,7 +68,7 @@ static String serializeAndEncodeQuery( @Nonnull final StructuredQuery query, fin`
`69`	`68`	`private static String selectorsToQueryString( @Nonnull final StructuredQuery q, final boolean applyEncoding )`
`70`	`69`	`{`
`71`	`70`	`final List<String> selectors = getSelectors(q, applyEncoding);`
`72`		`- return Joiner.on(",").join(selectors);`
	`71`	`+ return String.join(",", selectors);`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`/**`
`@@ -117,7 +116,7 @@ private static List<String> getSelectors( @Nonnull final StructuredQuery query,`
`117`	`116`	`private static String expansionsToQueryString( @Nonnull final StructuredQuery q, final boolean applyEncoding )`
`118`	`117`	`{`
`119`	`118`	`final List<String> filters = getExpansions(q, applyEncoding);`
`120`		`- return Joiner.on(",").join(filters);`
	`119`	`+ return String.join(",", filters);`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`/**`
`@@ -169,7 +168,7 @@ private static String filtersToQueryString( @Nonnull final StructuredQuery q, fi`
`169`	`168`	`final List<String> filters =`
`170`	`169`	`q.getFilters().stream().map(filter -> filter.getExpression(q.getProtocol())).collect(Collectors.toList());`
`171`	`170`
`172`		`- return conditionalEncode(Joiner.on(" and ").join(filters), applyEncoding);`
	`171`	`+ return conditionalEncode(String.join(" and ", filters), applyEncoding);`
`173`	`172`	`}`
`174`	`173`
`175`	`174`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`
`16`	`16`	`import javax.annotation.Nonnull;`
`17`	`17`
`18`		`-import com.google.common.base.Joiner;`
`19`		`-`
`20`	`18`	`import lombok.extern.slf4j.Slf4j;`
`21`	`19`
`22`	`20`	`/**`
`@@ -105,7 +103,7 @@ public Optional<String> getString( @Nonnull final String key )`
`105`	`103`	`*/`
`106`	`104`	`public void putString( @Nonnull final String key, @Nonnull final String value, @Nonnull final String... comments )`
`107`	`105`	`{`
`108`		`- mappings.put(new Key(key), new Value(value, Joiner.on(" ").join(comments)));`
	`106`	`+ mappings.put(new Key(key), new Value(value, String.join(" ", comments)));`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`private void populateMappings()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`import java.util.Collection;`
`4`	`4`	`import java.util.LinkedList;`
`5`	`5`
`6`		`-import com.google.common.base.Joiner;`
`7`	`6`	`import com.google.common.base.Strings;`
`8`	`7`	`import com.sun.codemodel.JDefinedClass;`
`9`	`8`	`import com.sun.codemodel.JDocComment;`
`@@ -121,7 +120,7 @@ static String getConstraints( final Service.Element element )`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`if( !parameterFacetsStrings.isEmpty() ) {`
`124`		`- parameterConstraintsString += Joiner.on(", ").join(parameterFacetsStrings);`
	`123`	`+ parameterConstraintsString += String.join(", ", parameterFacetsStrings);`
`125`	`124`	`} else {`
`126`	`125`	`parameterConstraintsString += "none";`
`127`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`import javax.annotation.Nullable;`
`12`	`12`
`13`	`13`	`import com.google.common.base.CaseFormat;`
`14`		`-import com.google.common.base.Joiner;`
`15`	`14`	`import com.google.common.base.Strings;`
`16`	`15`	`import com.google.common.escape.Escaper;`
`17`	`16`	`import com.google.common.html.HtmlEscapers;`
`@@ -143,7 +142,7 @@ private void addClassLevelJavadoc( final JDocComment javadoc, final Service serv`
`143`	`142`	`.format(`
`144`	`143`	`"<tr><td align='right'>%s:</td><td>%s</td></tr>",`
`145`	`144`	`entry.getName(),`
`146`		`- Joiner.on(", ").join(entry.getValues())));`
	`145`	`+ String.join(", ", entry.getValues())));`
`147`	`146`	`}`
`148`	`147`	`}`
`149`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`import com.fasterxml.jackson.annotation.JsonProperty;`
`33`	`33`	`import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;`
`34`	`34`	`import com.github.tomakehurst.wiremock.junit5.WireMockTest;`
`35`		`-import com.google.common.base.Joiner;`
`36`	`35`	`import com.google.common.collect.ImmutableMap;`
`37`	`36`	`import com.google.gson.annotations.JsonAdapter;`
`38`	`37`	`import com.google.gson.annotations.SerializedName;`
`@@ -274,7 +273,7 @@ private static String createPayloadSingle( final String payload )`
`274`	`273`
`275`	`274`	`private static String createPayloadMultiple( final String... payloads )`
`276`	`275`	`{`
`277`		`- return createPayloadSingle(format("{\"results\":[%s]}", Joiner.on(',').join(payloads)));`
	`276`	`+ return createPayloadSingle(format("{\"results\":[%s]}", String.join(",", payloads)));`
`278`	`277`	`}`
`279`	`278`
`280`	`279`	`private static String createTestEntity( final String id, final String rel )`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import javax.annotation.Nullable;`
`10`	`10`
`11`	`11`	`import com.google.common.base.CaseFormat;`
`12`		`-import com.google.common.base.Joiner;`
`13`	`12`	`import com.google.common.base.Strings;`
`14`	`13`	`import com.google.common.escape.Escaper;`
`15`	`14`	`import com.google.common.html.HtmlEscapers;`
`@@ -128,7 +127,7 @@ private void addClassLevelJavadoc( final JDocComment javadoc, final Service serv`
`128`	`127`	`.format(`
`129`	`128`	`"<tr><td align='right'>%s:</td><td>%s</td></tr>",`
`130`	`129`	`entry.getName(),`
`131`		`- Joiner.on(", ").join(entry.getValues())));`
	`130`	`+ String.join(", ", entry.getValues())));`
`132`	`131`	`}`
`133`	`132`	`}`
`134`	`133`	`}`