(commons-bcel) branch master updated: Update from deprecated code

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new da9113a9 Update from deprecated code
da9113a9 is described below

commit da9113a9639005711e77803232ea7b2a9e460d35
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Nov 30 08:20:06 2025 -0500

    Update from deprecated code
---
 src/main/java/org/apache/bcel/generic/Type.java                    | 3 ++-
 .../org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java  | 7 ++++---
 src/test/java/org/apache/bcel/verifier/VerifierTest.java           | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/bcel/generic/Type.java 
b/src/main/java/org/apache/bcel/generic/Type.java
index 3a1fffbf..91ec9aa1 100644
--- a/src/main/java/org/apache/bcel/generic/Type.java
+++ b/src/main/java/org/apache/bcel/generic/Type.java
@@ -28,6 +28,7 @@ import org.apache.bcel.classfile.ClassFormatException;
 import org.apache.bcel.classfile.InvalidMethodSignatureException;
 import org.apache.bcel.classfile.Utility;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 /**
  * Abstract super class for all possible Java types, namely basic types such 
as int, object types like String and array
@@ -287,7 +288,7 @@ public abstract class Type {
     }
 
     static String internalTypeNameToSignature(final String internalTypeName) {
-        if (StringUtils.isEmpty(internalTypeName) || 
StringUtils.equalsAny(internalTypeName, Const.SHORT_TYPE_NAMES)) {
+        if (StringUtils.isEmpty(internalTypeName) || 
Strings.CS.equalsAny(internalTypeName, Const.SHORT_TYPE_NAMES)) {
             return internalTypeName;
         }
         switch (internalTypeName.charAt(0)) {
diff --git 
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java 
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
index 9e425e9d..40b37f7d 100644
--- 
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
+++ 
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
 
 import org.apache.bcel.util.SyntheticRepository;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -313,10 +314,10 @@ class ConstantPoolModuleToStringTest {
             while (matcher.find()) {
                 switch (matcher.group(2)) {
                     case ":":
-                        assertTrue(StringUtils.containsAny(matcher.group(1), 
"name", "flags", "version"));
+                        assertTrue(Strings.CS.containsAny(matcher.group(1), 
"name", "flags", "version"));
                         break;
                     case "(":
-                        assertTrue(StringUtils.containsAny(matcher.group(1), 
"requires", "exports", "opens", "uses", "provides"));
+                        assertTrue(Strings.CS.containsAny(matcher.group(1), 
"requires", "exports", "opens", "uses", "provides"));
                         break;
                     default:
                         break;
@@ -387,7 +388,7 @@ class ConstantPoolModuleToStringTest {
             append(constantModule);
             append(constantModule.toString(pool));
             final String s = constantModule.toString(pool).trim();
-            final boolean condition = StringUtils.startsWithAny(s,
+            final boolean condition = Strings.CS.startsWithAny(s,
                     "jdk.",
                     "java.",
                     "org.junit",
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTest.java 
b/src/test/java/org/apache/bcel/verifier/VerifierTest.java
index 0208b37a..e15f46a1 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTest.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTest.java
@@ -39,7 +39,7 @@ import 
org.apache.bcel.verifier.exc.AssertionViolatedException;
 import org.apache.bcel.verifier.input.FieldVerifierChildClass;
 import org.apache.bcel.verifier.input.StaticFieldVerifierChildClass;
 import org.apache.bcel.verifier.statics.StringRepresentation;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.SystemProperties;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -53,7 +53,7 @@ class VerifierTest {
     }
 
     private static void testDefaultMethodValidation(final String className, 
final String... excludes) throws ClassNotFoundException {
-        if (StringUtils.endsWithAny(className, excludes)) {
+        if (Strings.CS.endsWithAny(className, excludes)) {
             return;
         }
         final Verifier verifier = VerifierFactory.getVerifier(className);