Stop using org.apache.commons.lang3.ArrayUtils

Author: tomasz-tylenda-sonarsource

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

@@ -20,7 +20,6 @@
 import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.apache.commons.lang3.ArrayUtils;
 import org.sonar.check.Rule;
 import org.sonar.plugins.java.api.JavaVersionAwareVisitor;
 import org.sonar.java.ast.visitors.SubscriptionVisitor;
@@ -61,7 +60,15 @@ public class DiamondOperatorCheck extends SubscriptionVisitor implements JavaVer
     Tree.Kind.RETURN_STATEMENT,
     Tree.Kind.ASSIGNMENT
   };
-  private static final Tree.Kind[] JAVA_8_KINDS = ArrayUtils.add(JAVA_7_KINDS, Tree.Kind.CONDITIONAL_EXPRESSION);
+
+  private static final Tree.Kind[] JAVA_8_KINDS = new Tree.Kind[] {
+    Tree.Kind.VARIABLE,
+    Tree.Kind.TYPE_CAST,
+    Tree.Kind.RETURN_STATEMENT,
+    Tree.Kind.ASSIGNMENT,
+    Tree.Kind.CONDITIONAL_EXPRESSION
+  };
+
   private Tree.Kind[] expressionKindsToCheck = JAVA_7_KINDS;
 
   @Override

java-frontend/src/test/java/org/sonar/java/classpath/ClasspathForMainTest.java

@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -70,7 +69,7 @@ void setup() {
       public String[] getStringArray(String key) {
         return get(key)
           .map(v -> MultivalueProperty.parseAsCsv(key, v))
-          .orElse(ArrayUtils.EMPTY_STRING_ARRAY);
+          .orElse(new String[0]);
       }
     };
     analysisWarnings = mock(AnalysisWarningsWrapper.class);