chore: bump org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0 in /dependency-bundles/bom (#857)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthias Kuhr <[email protected]>
Co-authored-by: Alexander Dümont <[email protected]>

Author: 3 people

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ComplexDestinationPropertyFactory.java

@@ -11,14 +11,13 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.net.HttpHeaders;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
 import com.sap.cloud.sdk.cloudplatform.security.BasicCredentials;
 import com.sap.cloud.sdk.cloudplatform.security.BearerCredentials;
 import com.sap.cloud.sdk.cloudplatform.security.Credentials;
 import com.sap.cloud.sdk.cloudplatform.security.NoCredentials;
+import com.sap.cloud.sdk.cloudplatform.util.StringUtils;
 
 import io.vavr.control.Option;
 import lombok.extern.slf4j.Slf4j;

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationUtility.java

@@ -5,7 +5,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang3.StringUtils;
+import com.sap.cloud.sdk.cloudplatform.util.StringUtils;
 
 import io.vavr.control.Option;
 import lombok.extern.slf4j.Slf4j;

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/UriPathMerger.java

@@ -1,5 +1,7 @@
 package com.sap.cloud.sdk.cloudplatform.connectivity;
 
+import static java.util.function.Predicate.not;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.stream.Collectors;
@@ -8,10 +10,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationPathsNotMergeableException;
 import com.sap.cloud.sdk.cloudplatform.exception.ShouldNotHappenException;
+import com.sap.cloud.sdk.cloudplatform.util.StringUtils;
 
 import io.vavr.control.Option;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +34,7 @@ public class UriPathMerger
      *            The secondary {@code URI}, usually identifying the request at runtime.
      *
      * @throws DestinationPathsNotMergeableException
-     *             If either of the request paths of the the given URIs are {@code null} or the URIs differ in the used
+     *             If either of the request paths of the given URIs are {@code null} or the URIs differ in the used
      *             schema, host, or port.
      *
      * @return The merged {@code URI}, representing the given request executed on the given destination.
@@ -66,7 +67,7 @@ public URI merge( @Nonnull final URI primaryUri, @Nullable final URI secondaryUr
         final String mergeQuery =
             Stream
                 .of(primaryUri.getRawQuery(), secondaryUri.getRawQuery())
-                .filter(StringUtils::isNotEmpty)
+                .filter(not(StringUtils::isBlank))
                 .collect(Collectors.joining("&"));
 
         try {

cloudplatform/cloudplatform-core/src/main/java/com/sap/cloud/sdk/cloudplatform/util/StringUtils.java

@@ -0,0 +1,211 @@
+package com.sap.cloud.sdk.cloudplatform.util;
+
+import java.util.Locale;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.common.annotations.Beta;
+
+/**
+ * Internal utility class for common String operations.
+ *
+ * @since 5.21.0
+ */
+@Beta
+public class StringUtils
+{
+    /**
+     * Checks if the given string starts with the specified prefix, ignoring case.
+     *
+     * @param str
+     *            the string to check
+     * @param prefix
+     *            the prefix to look for
+     * @return true if the string starts with the prefix, ignoring case; false otherwise
+     */
+    public static boolean startsWithIgnoreCase( @Nullable final String str, @Nullable final String prefix )
+    {
+        if( str == null || prefix == null ) {
+            return false;
+        }
+        if( str.length() < prefix.length() ) {
+            return false;
+        }
+        return str.substring(0, prefix.length()).equalsIgnoreCase(prefix);
+    }
+
+    /**
+     * Checks if the given string ends with the specified suffix, ignoring case.
+     *
+     * @param str
+     *            the string to check
+     * @param suffix
+     *            the suffix to look for
+     * @return true if the string ends with the suffix, ignoring case; false otherwise
+     */
+    public static boolean endsWithIgnoreCase( @Nullable final String str, @Nullable final String suffix )
+    {
+        if( str == null || suffix == null ) {
+            return false;
+        }
+        if( str.length() < suffix.length() ) {
+            return false;
+        }
+        return str.substring(str.length() - suffix.length()).equalsIgnoreCase(suffix);
+    }
+
+    /**
+     * Removes the specified prefix from the start of the string, ignoring case.
+     *
+     * @param s
+     *            the string to modify
+     * @param prefix
+     *            the prefix to remove
+     * @return the modified string with the prefix removed, or the original string if it did not start with the prefix;
+     */
+
+    @Nullable
+    public static String removeStartIgnoreCase( @Nullable final String s, @Nullable final String prefix )
+    {
+        if( startsWithIgnoreCase(s, prefix) ) {
+            return s.substring(prefix.length());
+        }
+        return s;
+    }
+
+    /**
+     * Removes the specified suffix from the end of the string, ignoring case.
+     *
+     * @param s
+     *            the string to modify
+     * @param prefix
+     *            the suffix to remove
+     * @return the modified string with the suffix removed, or the original string if it did not end with the suffix;
+     */
+    @Nonnull
+    public static String removeEndIgnoreCase( @Nonnull final String s, @Nonnull final String prefix )
+    {
+        if( endsWithIgnoreCase(s, prefix) ) {
+            return s.substring(0, s.length() - prefix.length());
+        }
+        return s;
+    }
+
+    /**
+     * Checks if the given string is blank.
+     *
+     * @param s
+     *            the string to check
+     * @return true if the string is null, empty, or contains only whitespace characters; false otherwise
+     */
+    public static boolean isBlank( @Nullable final String s )
+    {
+        return isEmpty(s) || s.isBlank();
+    }
+
+    /**
+     * Checks if the given string is empty.
+     *
+     * @param s
+     *            the string to check
+     * @return true if the string is null, or empty (""); false otherwise
+     */
+    public static boolean isEmpty( @Nullable final String s )
+    {
+        return s == null || s.isEmpty();
+    }
+
+    /**
+     * Checks if the given CharSequence is blank or empty.
+     *
+     * @param s
+     *            the CharSequence to check
+     * @return true if the CharSequence is null, empty, or contains only whitespace characters; false otherwise
+     */
+    public static boolean isBlank( @Nullable final CharSequence s )
+    {
+        return s != null && isBlank(s.toString());
+    }
+
+    /**
+     * Capitalizes the first character of the given string.
+     *
+     * @param s
+     *            the string to capitalize
+     * @return the string with the first character capitalized, or null if the input is null or empty
+     */
+    @Nullable
+    public static String capitalize( @Nullable final String s )
+    {
+        if( s == null || s.isEmpty() ) {
+            return s;
+        }
+        return s.substring(0, 1).toUpperCase(Locale.ROOT) + s.substring(1);
+    }
+
+    /**
+     * Uncapitalizes the first character of the given string.
+     *
+     * @param s
+     *            the string to uncapitalize
+     * @return the string with the first character uncapitalized, or null if the input is null or empty
+     */
+    @Nonnull
+    public static String uncapitalize( @Nonnull final String s )
+    {
+        if( s.isEmpty() ) {
+            return s;
+        }
+        return s.substring(0, 1).toLowerCase(Locale.ROOT) + s.substring(1);
+    }
+
+    /**
+     * Trims the given string and returns null if the result is empty.
+     *
+     * @param s
+     *            the string to trim
+     * @return the trimmed string, or null if the input is null or empty after trimming
+     */
+    @Nullable
+    public static String trimToNull( final @Nullable String s )
+    {
+        return isBlank(s) ? null : s.trim();
+    }
+
+    /**
+     * Prepends the specified prefix to the string if it does not already start with that prefix, ignoring case.
+     *
+     * @param s
+     *            the string to modify
+     * @param prefix
+     *            the prefix to prepend
+     * @return the modified string with the prefix prepended if it was not already present; otherwise, the original
+     *         string
+     */
+    @Nonnull
+    public static String prependIfMissing( @Nonnull final String s, @Nonnull final String prefix )
+    {
+        return startsWithIgnoreCase(s, prefix) ? s : prefix + s;
+    }
+
+    /**
+     * Returns the substring of the given string before the first occurrence of the specified suffix character.
+     *
+     * @param string
+     *            the string to search
+     * @param suffix
+     *            the character to search for
+     * @return the substring before the first occurrence of the suffix character, or the original string if the suffix
+     *         is not found;
+     */
+    @Nullable
+    public static String substringBefore( @Nullable final String string, final char suffix )
+    {
+        if( string == null ) {
+            return null;
+        }
+        final int pos = string.indexOf(suffix);
+        return pos >= 0 ? string.substring(0, pos) : string;
+    }
+}

cloudplatform/connectivity-apache-httpclient4/pom.xml

@@ -96,10 +96,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
 		<!-- scope "provided" -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>

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));
     }
 

cloudplatform/connectivity-apache-httpclient4/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/QueryParamGetter.java

@@ -5,10 +5,9 @@
 
 import javax.annotation.Nonnull;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.escape.Escaper;
 import com.google.common.net.PercentEscaper;
+import com.sap.cloud.sdk.cloudplatform.util.StringUtils;
 
 import io.vavr.control.Try;
 import lombok.extern.slf4j.Slf4j;

cloudplatform/connectivity-apache-httpclient4/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/SSLSocketFactoryUtil.java

@@ -8,7 +8,6 @@
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
@@ -18,6 +17,8 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 
+import com.sap.cloud.sdk.cloudplatform.util.StringUtils;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

cloudplatform/connectivity-apache-httpclient5/pom.xml

@@ -84,10 +84,6 @@
 			<groupId>org.apache.httpcomponents.core5</groupId>
 			<artifactId>httpcore5</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
 		<!-- scope "provided" -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>

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);