[Backport 2.x] Remove usages of org.apache.logging.log4j.util.Strings (…

…opensearch-project#4653) Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peternied · Aug 16, 2024 · 3e7d061 · 3e7d061
1 parent 5ff4b8a
commit 3e7d061
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/security/securityconf/ConfigModelV7.java b/src/main/java/org/opensearch/security/securityconf/ConfigModelV7.java
@@ -44,7 +44,6 @@
 import com.google.common.collect.SetMultimap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.util.Strings;
 
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.support.IndicesOptions;
@@ -800,7 +799,7 @@ public Set<String> getResolvedIndexPattern(
                 }
             }
 
-            if (Strings.isNotBlank(unresolved)) {
+            if (!(unresolved == null || unresolved.isBlank())) {
                 final String[] resolvedIndicesFromPattern = resolver.concreteIndexNames(
                     cs.state(),
                     IndicesOptions.lenientExpandOpen(),

diff --git a/src/test/java/com/amazon/dlic/auth/http/jwt/keybyoidc/TestJwts.java b/src/test/java/com/amazon/dlic/auth/http/jwt/keybyoidc/TestJwts.java
@@ -14,7 +14,6 @@
 import java.util.Set;
 
 import com.google.common.collect.ImmutableSet;
-import org.apache.logging.log4j.util.Strings;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSAlgorithm;
@@ -31,7 +30,7 @@
 class TestJwts {
     static final String ROLES_CLAIM = "roles";
     static final Set<String> TEST_ROLES = ImmutableSet.of("role1", "role2");
-    static final String TEST_ROLES_STRING = Strings.join(TEST_ROLES, ',');
+    static final String TEST_ROLES_STRING = String.join(",", TEST_ROLES);
 
     static final String TEST_AUDIENCE = "TestAudience";