SONARJAVA-5735 WIP Cleaning up thrid party dependencies

its/plugin/projects/servlet-jsp/pom.xml

@@ -50,11 +50,6 @@
       <artifactId>commons-lang</artifactId>
       <version>2.6</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

@@ -43,7 +43,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Fail;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -472,9 +471,9 @@ private static void instantiateTemplateRule(String ruleTemplateKey, String insta
       .filter(qualityProfile -> "rules".equals(qualityProfile.getName()))
       .map(QualityProfile::getKey)
       .findFirst()
-      .orElse(null);
+      .orElse("");
 
-    if (StringUtils.isEmpty(profileKey)) {
+    if (profileKey.isEmpty()) {
       LOG.error("Could not retrieve profile key : Template rule " + ruleTemplateKey + " has not been activated");
     } else {
       String ruleKey = "java:" + instantiationKey;

java-checks-aws/pom.xml

@@ -66,10 +66,6 @@
       <groupId>org.sonarsource.analyzer-commons</groupId>
       <artifactId>sonar-analyzer-recognizers</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

java-checks-common/pom.xml

@@ -55,10 +55,6 @@
       <groupId>org.sonarsource.analyzer-commons</groupId>
       <artifactId>sonar-analyzer-recognizers</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/TestCheckRegistrarContext.java

@@ -22,7 +22,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleScope;
 import org.sonar.api.rules.RuleAnnotationUtils;
@@ -94,7 +93,7 @@ private static void validateAndRegisterChecks(String repositoryKey,
                                                 List<Class<? extends JavaCheck>> destCheckClasses,
                                                 List<JavaCheck> destCheckInstances,
                                                 List<RuleKey> destRuleKeys) {
-    if (StringUtils.isBlank(repositoryKey)) {
+    if (repositoryKey == null || repositoryKey.isBlank()) {
       throw new IllegalArgumentException("Please specify a non blank repository key");
     }
     for (Object javaCheckClassOrInstance : javaCheckClassesAndInstances) {

java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java

@@ -49,11 +49,11 @@
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.utils.AnnotationUtils;
 import org.sonar.check.Rule;
 import org.sonar.java.annotations.VisibleForTesting;
 import org.sonar.java.checks.verifier.CheckVerifier;
+import org.sonar.java.common.StringUtils;
 import org.sonar.java.reporting.AnalyzerMessage;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;

java-checks/pom.xml

@@ -44,6 +44,11 @@
       <artifactId>java-checks-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>java-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.sonarsource.java</groupId>
@@ -66,10 +71,6 @@
       <groupId>org.sonarsource.analyzer-commons</groupId>
       <artifactId>sonar-analyzer-recognizers</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>

java-checks/src/main/java/org/sonar/java/checks/AbstractHardCodedCredentialChecker.java

@@ -23,8 +23,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.java.checks.helpers.ExpressionsHelper;
+import org.sonar.java.common.StringUtils;
 import org.sonar.java.model.LiteralUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

java-checks/src/main/java/org/sonar/java/checks/AbstractPrintfChecker.java

@@ -29,7 +29,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.annotation.Nullable;
-
 import org.sonar.java.checks.helpers.StringUtils;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.java.model.LiteralUtils;

java-checks/src/main/java/org/sonar/java/checks/CatchUsesExceptionWithContextCheck.java

@@ -29,10 +29,10 @@
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.java.checks.helpers.ExpressionsHelper;
+import org.sonar.java.common.Strings;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
@@ -136,7 +136,7 @@ private static boolean containsEnumValueOf(Tree tree) {
   }
 
   private static boolean containsLogIgnoreCase(String name) {
-    return Strings.CI.contains(name, "log");
+    return Strings.containsInsensitive(name, "log");
   }
 
   private static class EnumValueOfVisitor extends BaseTreeVisitor {

java-checks/src/main/java/org/sonar/java/checks/CommentContainsPatternChecker.java

@@ -16,7 +16,7 @@
  */
 package org.sonar.java.checks;
 
-import org.apache.commons.lang3.Strings;
+import org.sonar.java.common.Strings;
 import org.sonar.java.model.LineUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.SyntaxTrivia;
@@ -34,7 +34,7 @@ public CommentContainsPatternChecker(IssuableSubscriptionVisitor check, String p
   }
 
   private static boolean isLetterAround(String line, String pattern) {
-    int start = Strings.CI.indexOf(line, pattern);
+    int start = Strings.indexOfInsensitive(line, pattern);
     int end = start + pattern.length();
 
     boolean pre = start > 0 && Character.isLetter(line.charAt(start - 1));
@@ -45,10 +45,10 @@ private static boolean isLetterAround(String line, String pattern) {
 
   public void checkTrivia(SyntaxTrivia syntaxTrivia) {
     String comment = syntaxTrivia.comment();
-    if (Strings.CI.contains(comment, pattern)) {
+    if (Strings.containsInsensitive(comment, pattern)) {
       String[] lines = comment.split("\r\n?|\n");
       for (int i = 0; i < lines.length; i++) {
-        if (Strings.CI.contains(lines[i], pattern) && !isLetterAround(lines[i], pattern)) {
+        if (Strings.containsInsensitive(lines[i], pattern) && !isLetterAround(lines[i], pattern)) {
           newCheck.addIssue(LineUtils.startLine(syntaxTrivia) + i, message);
         }
       }

java-checks/src/main/java/org/sonar/java/checks/CommentedOutCodeLineCheck.java

@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
+import org.sonar.java.common.Strings;
 import org.sonar.java.model.DefaultJavaFileScannerContext;
 import org.sonar.java.model.LineUtils;
 import org.sonar.java.reporting.AnalyzerMessage;
@@ -156,7 +156,7 @@ private static boolean isJavadocLink(String line) {
    * A JSNI comment block begins with the exact token {@link #START_JSNI} and ends with the exact token {@link #END_JSNI}.
    */
   private static boolean isJSNI(String comment) {
-    return Strings.CS.startsWith(comment, START_JSNI) && Strings.CS.endsWith(comment, END_JSNI);
+    return Strings.startsWithSensitive(comment, START_JSNI) && Strings.endsWithSensitive(comment, END_JSNI);
   }
 
 }

java-checks/src/main/java/org/sonar/java/checks/DateFormatWeekYearCheck.java

@@ -18,10 +18,10 @@
 
 import java.util.Locale;
 import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.QuickFixHelper;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
+import org.sonar.java.common.StringUtils;
 import org.sonar.java.reporting.AnalyzerMessage;
 import org.sonar.java.reporting.InternalJavaIssueBuilder;
 import org.sonar.java.reporting.JavaQuickFix;
@@ -81,7 +81,7 @@ private void inspectPattern(ExpressionTree argument) {
       return;
     }
     String datePattern = literal.get();
-    if (StringUtils.contains(datePattern, 'w')) {
+    if (datePattern.contains("w")) {
       return;
     }
     int start = datePattern.indexOf('Y');

java-checks/src/main/java/org/sonar/java/checks/DisallowedConstructorCheck.java

@@ -16,10 +16,10 @@
  */
 package org.sonar.java.checks;
 
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
+import org.sonar.java.common.StringUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.tree.NewClassTree;
 
@@ -50,7 +50,7 @@ protected MethodMatchers getMethodInvocationMatchers() {
       } else {
         String[] trimmedArgs = new String[args.length];
         for (int i = 0; i < trimmedArgs.length; i++) {
-          trimmedArgs[i] = StringUtils.trim(args[i]);
+          trimmedArgs[i] = args[i].trim();
         }
         return invocationMatcher.addParametersMatcher(trimmedArgs).build();
       }

java-checks/src/main/java/org/sonar/java/checks/DisallowedMethodCheck.java

@@ -16,10 +16,10 @@
  */
 package org.sonar.java.checks;
 
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
+import org.sonar.java.common.StringUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.tree.MethodInvocationTree;
@@ -62,7 +62,7 @@ protected MethodMatchers getMethodInvocationMatchers() {
       } else {
         String[] trimmedArgs = new String[args.length];
         for (int i = 0; i < trimmedArgs.length; i++) {
-          trimmedArgs[i] = StringUtils.trim(args[i]);
+          trimmedArgs[i] = args[i].trim();
         }
         return parametersBuilder.addParametersMatcher(trimmedArgs).build();
       }

java-checks/src/main/java/org/sonar/java/checks/ImmediatelyReturnedVariableCheck.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
-import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.QuickFixHelper;
 import org.sonar.java.reporting.JavaQuickFix;
@@ -74,7 +73,7 @@ public void visitBlock(BlockTree tree) {
       String lastStatementIdentifier = getReturnOrThrowIdentifier(lastStatement);
       if (lastStatementIdentifier != null) {
         String identifier = variableTree.simpleName().name();
-        if (Strings.CS.equals(lastStatementIdentifier, identifier)) {
+        if (lastStatementIdentifier.equals(identifier)) {
           ExpressionTree initializer = variableTree.initializer();
           if (initializer == null) {
             // Can only happen for non-compilable code, still, we should not report anything.

java-checks/src/main/java/org/sonar/java/checks/PatternUtils.java

@@ -16,8 +16,8 @@
  */
 package org.sonar.java.checks;
 
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.utils.WildcardPattern;
+import org.sonar.java.common.StringUtils;
 
 public final class PatternUtils {
 
@@ -28,7 +28,7 @@ public static WildcardPattern[] createPatterns(String patterns) {
     String[] p = StringUtils.split(patterns, ',');
     WildcardPattern[] result = new WildcardPattern[p.length];
     for (int i = 0; i < result.length; i++) {
-      result[i] = WildcardPattern.create(StringUtils.trim(p[i]), ".");
+      result[i] = WildcardPattern.create(p[i].trim(), ".");
     }
     return result;
   }

java-checks/src/main/java/org/sonar/java/checks/RegexPatternsNeedlesslyCheck.java

@@ -17,9 +17,9 @@
 package org.sonar.java.checks;
 
 import java.util.Optional;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
+import org.sonar.java.common.MiscUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;
@@ -99,7 +99,7 @@ private static boolean isConstant(Tree tree) {
    *
    */
   private static boolean exceptionSplitMethod(String argValue) {
-    String regex = StringEscapeUtils.unescapeJava(argValue);
+    String regex = MiscUtils.unescapeJava(argValue);
     char ch;
     return ((regex.length() == 1 && ".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
       (regex.length() == 2 &&

java-checks/src/main/java/org/sonar/java/checks/StringToPrimitiveConversionCheck.java

@@ -16,8 +16,8 @@
  */
 package org.sonar.java.checks;
 
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.check.Rule;
+import org.sonar.java.common.StringUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;

java-checks/src/main/java/org/sonar/java/checks/SuppressWarningsCheck.java

@@ -23,7 +23,6 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.java.model.LiteralUtils;
@@ -85,7 +84,7 @@ private Set<String> getAllowedWarnings() {
     }
 
     allowedWarnings = Arrays.stream(warningsCommaSeparated.split(","))
-      .filter(StringUtils::isNotBlank)
+      .filter(s -> !s.isBlank())
       .map(SuppressWarningsCheck::replaceFormerRepositoryPrefix)
       .collect(Collectors.toSet());
 

java-checks/src/main/java/org/sonar/java/checks/TrailingCommentCheck.java

@@ -21,9 +21,9 @@
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.Strings;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
+import org.sonar.java.common.Strings;
 import org.sonar.java.model.LineUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
@@ -102,7 +102,7 @@ public void visitToken(SyntaxToken syntaxToken) {
 
   private static boolean containsExcludedPattern(String comment) {
     for (String excludePattern : EXCLUDED_PATTERNS) {
-      if (Strings.CI.contains(comment, excludePattern)) {
+      if (Strings.containsInsensitive(comment, excludePattern)) {
         return true;
       }
     }

java-checks/src/main/java/org/sonar/java/checks/UndocumentedApiCheck.java

@@ -21,12 +21,12 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.utils.WildcardPattern;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.java.ast.visitors.PublicApiChecker;
 import org.sonar.java.checks.helpers.Javadoc;
+import org.sonar.java.common.StringUtils;
 import org.sonar.java.model.PackageUtils;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;

java-checks/src/main/java/org/sonar/java/checks/helpers/LatinAlphabetLanguagesHelper.java

@@ -16,10 +16,11 @@
  */
 package org.sonar.java.checks.helpers;
 
+import org.sonar.java.common.StringUtils;
+
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
 
 public class LatinAlphabetLanguagesHelper {
 

java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java

@@ -42,8 +42,8 @@
 import org.sonar.plugins.java.api.tree.Modifier;
 import org.sonar.plugins.java.api.tree.Tree;
 
-import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.sonar.java.checks.helpers.UnitTestUtils.isUnitTest;
+import static org.sonar.java.common.StringUtils.isEmpty;
 
 @Rule(key = "S2699")
 public class AssertionsInTestsCheck extends BaseTreeVisitor implements JavaFileScanner {