SONARPY-3186 fix deprecated method calls in commons-lang (#396)

GitOrigin-RevId: b7fcce963e6782c91baaa3594a82e92a5621070e

Author: Seppli11

pom.xml

@@ -87,6 +87,7 @@
     <!-- versions -->
     <commons.io.version>2.19.0</commons.io.version>
     <commons.lang.version>3.18.0</commons.lang.version>
+    <commons.text.version>1.13.1</commons.text.version>
     <assertj-core.version>3.27.3</assertj-core.version>
     <junit.version>5.13.3</junit.version>
     <logback.version>1.5.18</logback.version>
@@ -178,6 +179,11 @@
         <artifactId>commons-lang3</artifactId>
         <version>${commons.lang.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${commons.text.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>

python-commons/pom.xml

@@ -66,6 +66,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.staxmate</groupId>
       <artifactId>staxmate</artifactId>

python-commons/src/main/java/org/sonar/plugins/python/coverage/CoberturaParser.java

@@ -22,8 +22,8 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import javax.xml.stream.XMLStreamException;
 import org.apache.commons.io.FilenameUtils;
@@ -154,7 +154,7 @@ private static void collectFileData(SMInputCursor classCursor, NewCoverage cover
 
       String isBranch = line.getAttrValue("branch");
       String text = line.getAttrValue("condition-coverage");
-      if (StringUtils.equals(isBranch, "true") && StringUtils.isNotBlank(text)) {
+      if (Objects.equals(isBranch, "true") && StringUtils.isNotBlank(text)) {
         String[] conditions = StringUtils.split(StringUtils.substringBetween(text, "(", ")"), "/");
         coverage.conditions(lineId, Integer.parseInt(conditions[1]), Integer.parseInt(conditions[0]));
       }

python-commons/src/main/java/org/sonar/plugins/python/parser/StaxParser.java

@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.codehaus.staxmate.SMInputFactory;
 import org.codehaus.staxmate.in.SMHierarchicCursor;
 import org.sonarsource.analyzer.commons.xml.SafeStaxParserFactory;
@@ -68,7 +68,7 @@ private static class UndeclaredEntitiesXMLResolver implements XMLResolver {
     public Object resolveEntity(String arg0, String arg1, String fileName, String undeclaredEntity) throws XMLStreamException {
       String undeclared = undeclaredEntity;
       // avoid problems with XML docs containing undeclared entities.. return the entity under its raw form if not a Unicode expression
-      if (StringUtils.startsWithIgnoreCase(undeclaredEntity, "u") && undeclaredEntity.length() == 5) {
+      if (Strings.CI.startsWith(undeclaredEntity, "u") && undeclaredEntity.length() == 5) {
         int unicodeCharHexValue = Integer.parseInt(undeclaredEntity.substring(1), 16);
         if (Character.isDefined(unicodeCharHexValue)) {
           undeclared = new String(new char[] {(char) unicodeCharHexValue});

python-commons/src/main/java/org/sonar/plugins/python/xunit/PythonXUnitSensor.java

@@ -24,6 +24,7 @@
 import javax.annotation.CheckForNull;
 import javax.xml.stream.XMLStreamException;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputComponent;
 import org.sonar.api.batch.fs.InputFile;
@@ -136,13 +137,13 @@ private InputFile findResource(TestCase testCase, String fileKey) {
 
   private InputFile findResourceUsingNoseTestsStrategy(String fileKey) {
     // a) check assuming the key doesnt contain the class name
-    String candidateKey = StringUtils.replace(fileKey, ".", "/") + ".py";
+    String candidateKey = Strings.CS.replace(fileKey, ".", "/") + ".py";
 
     InputFile unitTestFile = getSonarTestFile(new File(candidateKey));
 
     if (unitTestFile == null) {
       // b) check assuming the key *does* contain the class name
-      String candidateKey2 = StringUtils.replace(StringUtils.substringBeforeLast(fileKey, "."), ".", "/") + ".py";
+      String candidateKey2 = Strings.CS.replace(StringUtils.substringBeforeLast(fileKey, "."), ".", "/") + ".py";
       if ( !(candidateKey2.equals(candidateKey))) {
         unitTestFile = getSonarTestFile(new File(candidateKey2));
       }

python-commons/src/main/java/org/sonar/plugins/python/xunit/TestCase.java

@@ -18,7 +18,7 @@
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 /**
  * Represents a unit test case. Has a couple of data items like name, status, time etc. associated. Reports testcase details in
@@ -109,8 +109,8 @@ public String getDetails() {
     StringBuilder details = new StringBuilder();
     details.append("<testcase status=\"").append(status).append("\" time=\"").append(time).append("\" name=\"").append(name).append("\"");
     if (isError() || isFailure()) {
-      details.append(">").append(isError() ? "<error message=\"" : "<failure message=\"").append(StringEscapeUtils.escapeXml(errorMessage))
-          .append("\">").append("<![CDATA[").append(StringEscapeUtils.escapeXml(stackTrace)).append("]]>")
+      details.append(">").append(isError() ? "<error message=\"" : "<failure message=\"").append(StringEscapeUtils.escapeXml11(errorMessage))
+          .append("\">").append("<![CDATA[").append(StringEscapeUtils.escapeXml11(stackTrace)).append("]]>")
           .append(isError() ? "</error>" : "</failure>").append("</testcase>");
     } else {
       details.append("/>");