Skip to content

Commit 0fd0447

Browse files
SONARJAVA-5741 Stop using org.apache.commons.lang3.StringUtils::isEmpty
1 parent 00a68bd commit 0fd0447

File tree

6 files changed

+19
-5
lines changed

6 files changed

+19
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import java.util.regex.Matcher;
2424
import java.util.regex.Pattern;
2525
import java.util.stream.Stream;
26-
import org.apache.commons.lang3.StringUtils;
2726
import org.sonar.java.checks.helpers.ExpressionsHelper;
27+
import org.sonar.java.checks.helpers.StringUtils;
2828
import org.sonar.java.model.LiteralUtils;
2929
import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
3030
import org.sonar.plugins.java.api.semantic.MethodMatchers;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*/
1717
package org.sonar.java.checks;
1818

19-
import org.apache.commons.lang3.StringUtils;
2019
import org.sonar.check.Rule;
2120
import org.sonar.check.RuleProperty;
21+
import org.sonar.java.checks.helpers.StringUtils;
2222
import org.sonar.java.checks.methods.AbstractMethodDetection;
2323
import org.sonar.plugins.java.api.semantic.MethodMatchers;
2424
import org.sonar.plugins.java.api.tree.NewClassTree;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*/
1717
package org.sonar.java.checks;
1818

19-
import org.apache.commons.lang3.StringUtils;
2019
import org.sonar.check.Rule;
2120
import org.sonar.check.RuleProperty;
21+
import org.sonar.java.checks.helpers.StringUtils;
2222
import org.sonar.java.checks.methods.AbstractMethodDetection;
2323
import org.sonar.java.model.ExpressionUtils;
2424
import org.sonar.plugins.java.api.semantic.MethodMatchers;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import java.util.Set;
2222
import java.util.regex.Pattern;
2323
import java.util.stream.Collectors;
24-
import org.apache.commons.lang3.StringUtils;
2524
import org.sonar.api.utils.WildcardPattern;
2625
import org.sonar.check.Rule;
2726
import org.sonar.check.RuleProperty;
2827
import org.sonar.java.ast.visitors.PublicApiChecker;
2928
import org.sonar.java.checks.helpers.Javadoc;
29+
import org.sonar.java.checks.helpers.StringUtils;
3030
import org.sonar.java.model.PackageUtils;
3131
import org.sonar.plugins.java.api.JavaFileScanner;
3232
import org.sonar.plugins.java.api.JavaFileScannerContext;

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ public static boolean isEmpty(@Nullable String s) {
2626
return s == null || s.isEmpty();
2727
}
2828

29+
/** Opposite of {@link #isEmpty(String)}. */
30+
public static boolean isNotEmpty(@Nullable String s) {
31+
return !isEmpty(s);
32+
}
33+
2934
/** Count non-overlapping occurrences of <code>pattern</code> in the <code>string</code>. */
3035
public static int countMatches(@Nullable String string, @Nullable String pattern) {
3136
if (isEmpty(string) || isEmpty(pattern)) {
@@ -41,4 +46,13 @@ public static int countMatches(@Nullable String string, @Nullable String pattern
4146

4247
return count;
4348
}
49+
50+
/**
51+
* Calls {@link org.apache.commons.lang3.StringUtils#split(String, String)}.
52+
*
53+
* <p>This method exists to avoid name clash between two <code>StringUtils</code> classes.
54+
*/
55+
public static String[] split(String string, String separator) {
56+
return org.apache.commons.lang3.StringUtils.split(string, separator);
57+
}
4458
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.sonar.plugins.java.api.tree.Modifier;
4343
import org.sonar.plugins.java.api.tree.Tree;
4444

45-
import static org.apache.commons.lang3.StringUtils.isEmpty;
45+
import static org.sonar.java.checks.helpers.StringUtils.isEmpty;
4646
import static org.sonar.java.checks.helpers.UnitTestUtils.isUnitTest;
4747

4848
@Rule(key = "S2699")

0 commit comments

Comments
 (0)