Replace deprecated StringUtils method usages

cirras · fourls · commit 57846c91f467 · 2025-07-14T11:43:32.000+10:00
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/AbstractFormResourceCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/AbstractFormResourceCheck.java
@@ -19,7 +19,7 @@
 package au.com.integradev.delphi.checks;
 
 import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiAst;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeDeclarationNode;
@@ -69,7 +69,7 @@ public DelphiCheckContext visit(TypeDeclarationNode declaration, DelphiCheckCont
 
   private boolean isFormResource(CompilerDirective directive) {
     return directive instanceof ResourceDirective
-        && StringUtils.endsWithIgnoreCase(
+        && Strings.CI.endsWith(
             ((ResourceDirective) directive).getResourceFile(), "." + getResourceFileExtension());
   }
 
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/HelperNameCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/HelperNameCheck.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.plugins.communitydelphi.api.ast.FileTypeNode;
@@ -81,14 +81,14 @@ static String getExtendedTypeSimpleName(TypeNode typeNode) {
 
   private boolean compliesWithNameRule(String helperName, String extendedTypeName) {
     if (!NameConventionUtils.compliesWithPrefix(helperName, helperPrefixesList)
-        || !StringUtils.endsWith(helperName, "Helper")) {
+        || !Strings.CS.endsWith(helperName, "Helper")) {
       return false;
     }
 
     return Streams.concat(
             extendedTypePrefixesList.stream()
                 .filter(extendedTypeName::startsWith)
-                .map(prefix -> StringUtils.removeStart(extendedTypeName, prefix)),
+                .map(prefix -> Strings.CS.removeStart(extendedTypeName, prefix)),
             Stream.of(extendedTypeName))
         .anyMatch(
             extendedNameNoPrefix ->
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/IfThenShortCircuitCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/IfThenShortCircuitCheck.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.plugins.communitydelphi.api.ast.ArgumentListNode;
 import org.sonar.plugins.communitydelphi.api.ast.ArgumentNode;
@@ -133,7 +133,7 @@ private static boolean isAccessedBy(String image, ExpressionNode expression) {
             primaryImage -> {
               char nextChar = primaryImage.charAt(image.length());
               return (nextChar == '.' || nextChar == '^')
-                  && StringUtils.startsWithIgnoreCase(primaryImage, image);
+                  && Strings.CI.startsWith(primaryImage, image);
             });
   }
 
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/MixedNamesCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/MixedNamesCheck.java
@@ -26,7 +26,7 @@
 import com.google.common.collect.ImmutableSortedSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.plugins.communitydelphi.api.ast.ArgumentListNode;
@@ -139,7 +139,7 @@ public DelphiCheckContext visit(AttributeNode attributeNode, DelphiCheckContext
         String actual = occurrence.getImage();
         String expected = declaration.getImage();
         if (actual.length() != expected.length()) {
-          expected = StringUtils.removeEndIgnoreCase(expected, "Attribute");
+          expected = Strings.CI.removeEnd(expected, "Attribute");
         }
 
         if (!actual.equals(expected)) {
@@ -195,7 +195,7 @@ private void checkUnitReference(
       String unitName = originalDeclaration.fullyQualifiedName();
 
       // Only add violations on import names that are not aliases and do not match the original case
-      if (StringUtils.endsWithIgnoreCase(unitName, importName) && !unitName.endsWith(importName)) {
+      if (Strings.CI.endsWith(unitName, importName) && !unitName.endsWith(importName)) {
         String matchingSegment = unitName.substring(unitName.length() - importName.length());
 
         context
diff --git a/delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g b/delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g
@@ -130,7 +130,7 @@ import au.com.integradev.delphi.utils.LocatableException;
 
 package au.com.integradev.delphi.antlr;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import au.com.integradev.delphi.utils.LocatableException;
 }
 
@@ -1589,9 +1589,9 @@ COMMENT                 :  '//' ~('\n'|'\r')*                          {$channel
 
                               if ($text.startsWith(start + "\$")) {
                                 $type = TkCompilerDirective;
-                                if (StringUtils.startsWithIgnoreCase($text, start + "\$endif") || StringUtils.startsWithIgnoreCase($text, start + "\$ifend")) {
+                                if (Strings.CI.startsWith($text, start + "\$endif") || Strings.CI.startsWith($text, start + "\$ifend")) {
                                   --directiveNesting;
-                                } else if (StringUtils.startsWithIgnoreCase($text, start + "\$if")) {
+                                } else if (Strings.CI.startsWith($text, start + "\$if")) {
                                   ++directiveNesting;
                                 }
                               }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/IdentifierNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/IdentifierNodeImpl.java
@@ -20,7 +20,7 @@
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
 import org.antlr.runtime.Token;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.ast.IdentifierNode;
 
 public final class IdentifierNodeImpl extends DelphiNodeImpl implements IdentifierNode {
@@ -38,7 +38,7 @@ public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
   @Override
   public String getImage() {
     if (normalizedImage == null) {
-      normalizedImage = StringUtils.removeStart(super.getImage(), "&");
+      normalizedImage = Strings.CS.removeStart(super.getImage(), "&");
     }
     return normalizedImage;
   }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/IntegerLiteralNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/IntegerLiteralNodeImpl.java
@@ -22,6 +22,7 @@
 import java.math.BigInteger;
 import org.antlr.runtime.Token;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.ast.IntegerLiteralNode;
 import org.sonar.plugins.communitydelphi.api.type.Type;
 
@@ -60,10 +61,10 @@ public String getDigits() {
     digits = StringUtils.remove(digits, '_');
     switch (getTokenType()) {
       case HEX_NUMBER:
-        digits = StringUtils.removeStart(digits, "$");
+        digits = Strings.CS.removeStart(digits, "$");
         break;
       case BINARY_NUMBER:
-        digits = StringUtils.removeStart(digits, "%");
+        digits = Strings.CS.removeStart(digits, "%");
         break;
       default:
         // do nothing
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RealLiteralNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RealLiteralNodeImpl.java
@@ -22,6 +22,7 @@
 import java.math.BigDecimal;
 import org.antlr.runtime.Token;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.ast.RealLiteralNode;
 import org.sonar.plugins.communitydelphi.api.type.IntrinsicType;
 import org.sonar.plugins.communitydelphi.api.type.Type;
@@ -47,6 +48,6 @@ public Type getType() {
   }
 
   private String getNormalizedImage() {
-    return StringUtils.remove(StringUtils.stripStart(getImage(), "&"), "_");
+    return Strings.CS.remove(StringUtils.stripStart(getImage(), "&"), "_");
   }
 }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/TextLiteralNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/TextLiteralNodeImpl.java
@@ -25,6 +25,7 @@
 import java.util.stream.Collectors;
 import org.antlr.runtime.Token;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
 import org.sonar.plugins.communitydelphi.api.ast.TextLiteralNode;
 import org.sonar.plugins.communitydelphi.api.token.DelphiTokenType;
@@ -121,7 +122,7 @@ private String createMultilineValue() {
     }
 
     return lines.stream()
-        .map(line -> StringUtils.removeStart(line, indentation))
+        .map(line -> Strings.CS.removeStart(line, indentation))
         .collect(Collectors.joining(lineEnding));
   }
 
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/utils/NumericUtils.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/utils/NumericUtils.java
@@ -19,7 +19,7 @@
 package au.com.integradev.delphi.msbuild.utils;
 
 import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public final class NumericUtils {
   private NumericUtils() {
@@ -33,7 +33,7 @@ public static Optional<Double> parse(String value) {
       // do nothing
     }
 
-    if (value.length() > 2 && StringUtils.startsWithIgnoreCase(value, "0x")) {
+    if (value.length() > 2 && Strings.CI.startsWith(value, "0x")) {
       try {
         return Optional.of((double) Integer.parseInt(value.substring(2), 16));
       } catch (NumberFormatException e) {
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/preprocessor/directive/expression/ExpressionParser.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/preprocessor/directive/expression/ExpressionParser.java
@@ -53,7 +53,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public class ExpressionParser {
   public static class ExpressionParserError extends RuntimeException {
@@ -283,7 +283,7 @@ private String evaluateMultilineString(String text, TextBlockLineEndingMode line
     }
 
     return lines.stream()
-        .map(line -> StringUtils.removeStart(line, indentation))
+        .map(line -> Strings.CS.removeStart(line, indentation))
         .collect(Collectors.joining(lineEnding));
   }
 
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/preprocessor/directive/expression/Expressions.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/preprocessor/directive/expression/Expressions.java
@@ -41,6 +41,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.plugins.communitydelphi.api.type.IntrinsicType;
 import org.sonar.plugins.communitydelphi.api.type.Type;
 import org.sonar.plugins.communitydelphi.api.type.TypeFactory;
@@ -167,11 +168,11 @@ private static BigInteger bigIntegerFromTextWithDigitSeparatorsAndRadixPrefix(St
       int radix;
       switch (text.charAt(0)) {
         case '$':
-          text = StringUtils.removeStart(text, "$");
+          text = Strings.CS.removeStart(text, "$");
           radix = 16;
           break;
         case '%':
-          text = StringUtils.removeStart(text, "%");
+          text = Strings.CS.removeStart(text, "%");
           radix = 2;
           break;
         default:
diff --git a/delphi-frontend/src/test/java/au/com/integradev/delphi/symbol/resolve/OperatorOverloadResolutionTest.java b/delphi-frontend/src/test/java/au/com/integradev/delphi/symbol/resolve/OperatorOverloadResolutionTest.java
@@ -29,7 +29,7 @@
 import com.google.common.collect.Iterables;
 import java.math.BigInteger;
 import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.aggregator.AggregateWith;
@@ -426,7 +426,7 @@ private static Type getType(String name) {
     }
 
     if (name.endsWith("_Subrange")) {
-      var hostType = (IntegerType) getType(StringUtils.removeEnd(name, "_Subrange"));
+      var hostType = (IntegerType) getType(Strings.CS.removeEnd(name, "_Subrange"));
       BigInteger min;
       BigInteger max;
 
@@ -442,7 +442,7 @@ private static Type getType(String name) {
     }
 
     if (name.endsWith("_Alias")) {
-      Type aliasedType = getType(StringUtils.removeEnd(name, "_Alias"));
+      Type aliasedType = getType(Strings.CS.removeEnd(name, "_Alias"));
       return TYPE_FACTORY.strongAlias(name, aliasedType);
     }
 
diff --git a/delphi-tokens-generator-maven-plugin/src/main/java/au/com/integradev/delphi/DelphiTokensGenerator.java b/delphi-tokens-generator-maven-plugin/src/main/java/au/com/integradev/delphi/DelphiTokensGenerator.java
@@ -28,7 +28,7 @@
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public class DelphiTokensGenerator {
   private static final Pattern TOKENS_LINE_PATTERN =
@@ -170,8 +170,8 @@ private static TokenTypeRecord createTokenType(String line) {
   }
 
   private static String antlrNameToEnumName(String antlrName) {
-    antlrName = StringUtils.removeStart(antlrName, "Tk");
-    antlrName = StringUtils.removeEnd(antlrName, DEPRECATED_SUFFIX);
+    antlrName = Strings.CS.removeStart(antlrName, "Tk");
+    antlrName = Strings.CS.removeEnd(antlrName, DEPRECATED_SUFFIX);
 
     StringBuilder result = new StringBuilder();
     boolean nextCapitalIsNewWord = true;

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ import au.com.integradev.delphi.utils.LocatableException;`
`130`	`130`
`131`	`131`	`package au.com.integradev.delphi.antlr;`
`132`	`132`
`133`		`-import org.apache.commons.lang3.StringUtils;`
	`133`	`+import org.apache.commons.lang3.Strings;`
`134`	`134`	`import au.com.integradev.delphi.utils.LocatableException;`
`135`	`135`	`}`
`136`	`136`
`@@ -1589,9 +1589,9 @@ COMMENT : '//' ~('\n'\|'\r')* {$channel`
`1589`	`1589`
`1590`	`1590`	`if ($text.startsWith(start + "\$")) {`
`1591`	`1591`	`$type = TkCompilerDirective;`
`1592`		`- if (StringUtils.startsWithIgnoreCase($text, start + "\$endif") \|\| StringUtils.startsWithIgnoreCase($text, start + "\$ifend")) {`
	`1592`	`+ if (Strings.CI.startsWith($text, start + "\$endif") \|\| Strings.CI.startsWith($text, start + "\$ifend")) {`
`1593`	`1593`	`--directiveNesting;`
`1594`		`- } else if (StringUtils.startsWithIgnoreCase($text, start + "\$if")) {`
	`1594`	`+ } else if (Strings.CI.startsWith($text, start + "\$if")) {`
`1595`	`1595`	`++directiveNesting;`
`1596`	`1596`	`}`
`1597`	`1597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import java.math.BigDecimal;`
`23`	`23`	`import org.antlr.runtime.Token;`
`24`	`24`	`import org.apache.commons.lang3.StringUtils;`
	`25`	`+import org.apache.commons.lang3.Strings;`
`25`	`26`	`import org.sonar.plugins.communitydelphi.api.ast.RealLiteralNode;`
`26`	`27`	`import org.sonar.plugins.communitydelphi.api.type.IntrinsicType;`
`27`	`28`	`import org.sonar.plugins.communitydelphi.api.type.Type;`
`@@ -47,6 +48,6 @@ public Type getType() {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`private String getNormalizedImage() {`
`50`		`- return StringUtils.remove(StringUtils.stripStart(getImage(), "&"), "_");`
	`51`	`+ return Strings.CS.remove(StringUtils.stripStart(getImage(), "&"), "_");`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import java.util.stream.Collectors;`
`26`	`26`	`import org.antlr.runtime.Token;`
`27`	`27`	`import org.apache.commons.lang3.StringUtils;`
	`28`	`+import org.apache.commons.lang3.Strings;`
`28`	`29`	`import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;`
`29`	`30`	`import org.sonar.plugins.communitydelphi.api.ast.TextLiteralNode;`
`30`	`31`	`import org.sonar.plugins.communitydelphi.api.token.DelphiTokenType;`
`@@ -121,7 +122,7 @@ private String createMultilineValue() {`
`121`	`122`	`}`
`122`	`123`
`123`	`124`	`return lines.stream()`
`124`		`- .map(line -> StringUtils.removeStart(line, indentation))`
	`125`	`+ .map(line -> Strings.CS.removeStart(line, indentation))`
`125`	`126`	`.collect(Collectors.joining(lineEnding));`
`126`	`127`	`}`
`127`	`128`