Skip to content

SONARJAVA-5703 Fix Quality Flaws caused by commons-lang3 new version #5266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2025
Merged

SONARJAVA-5703 Fix Quality Flaws caused by commons-lang3 new version #5266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-checks/src/main/java/org/sonar/java/checks/CatchUsesExceptionWithContextCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.stream.Stream;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
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.java.checks.helpers.ExpressionsHelper;
Expand Down Expand Up @@ -136,7 +136,7 @@ private static boolean containsEnumValueOf(Tree tree) {
}

private static boolean containsLogIgnoreCase(String name) {
return StringUtils.containsIgnoreCase(name, "log");
return Strings.CI.contains(name, "log");
}

private static class EnumValueOfVisitor extends BaseTreeVisitor {
Expand Down
8 changes: 4 additions & 4 deletions java-checks/src/main/java/org/sonar/java/checks/CommentContainsPatternChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.sonar.java.checks;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.sonar.java.model.LineUtils;
import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
import org.sonar.plugins.java.api.tree.SyntaxTrivia;
Expand All @@ -34,7 +34,7 @@ public CommentContainsPatternChecker(IssuableSubscriptionVisitor check, String p
}

private static boolean isLetterAround(String line, String pattern) {
int start = StringUtils.indexOfIgnoreCase(line, pattern);
int start = Strings.CI.indexOf(line, pattern);
int end = start + pattern.length();

boolean pre = start > 0 && Character.isLetter(line.charAt(start - 1));
Expand All @@ -45,10 +45,10 @@ private static boolean isLetterAround(String line, String pattern) {

public void checkTrivia(SyntaxTrivia syntaxTrivia) {
String comment = syntaxTrivia.comment();
if (StringUtils.containsIgnoreCase(comment, pattern)) {
if (Strings.CI.contains(comment, pattern)) {
String[] lines = comment.split("\r\n?|\n");
for (int i = 0; i < lines.length; i++) {
if (StringUtils.containsIgnoreCase(lines[i], pattern) && !isLetterAround(lines[i], pattern)) {
if (Strings.CI.contains(lines[i], pattern) && !isLetterAround(lines[i], pattern)) {
newCheck.addIssue(LineUtils.startLine(syntaxTrivia) + i, message);
}
}
Expand Down
4 changes: 2 additions & 2 deletions java-checks/src/main/java/org/sonar/java/checks/CommentedOutCodeLineCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;
import java.util.Optional;
import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.sonar.check.Rule;
import org.sonar.java.model.DefaultJavaFileScannerContext;
import org.sonar.java.model.LineUtils;
Expand Down Expand Up @@ -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 StringUtils.startsWith(comment, START_JSNI) && StringUtils.endsWith(comment, END_JSNI);
return Strings.CS.startsWith(comment, START_JSNI) && Strings.CS.endsWith(comment, END_JSNI);
}

}
6 changes: 3 additions & 3 deletions java-checks/src/main/java/org/sonar/java/checks/ImmediatelyReturnedVariableCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
import java.util.List;
import java.util.Map;
import javax.annotation.CheckForNull;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.sonar.check.Rule;
import org.sonar.java.checks.helpers.QuickFixHelper;
import org.sonarsource.analyzer.commons.collections.MapBuilder;
import org.sonar.java.reporting.JavaQuickFix;
import org.sonar.java.reporting.JavaTextEdit;
import org.sonar.plugins.java.api.JavaFileScanner;
Expand All @@ -36,6 +35,7 @@
import org.sonar.plugins.java.api.tree.ThrowStatementTree;
import org.sonar.plugins.java.api.tree.Tree.Kind;
import org.sonar.plugins.java.api.tree.VariableTree;
import org.sonarsource.analyzer.commons.collections.MapBuilder;

import static org.sonar.java.reporting.AnalyzerMessage.textSpanBetween;

Expand Down Expand Up @@ -74,7 +74,7 @@ public void visitBlock(BlockTree tree) {
String lastStatementIdentifier = getReturnOrThrowIdentifier(lastStatement);
if (lastStatementIdentifier != null) {
String identifier = variableTree.simpleName().name();
if (StringUtils.equals(lastStatementIdentifier, identifier)) {
if (Strings.CS.equals(lastStatementIdentifier, identifier)) {
ExpressionTree initializer = variableTree.initializer();
if (initializer == null) {
// Can only happen for non-compilable code, still, we should not report anything.
Expand Down
4 changes: 2 additions & 2 deletions java-checks/src/main/java/org/sonar/java/checks/TrailingCommentCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
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.java.model.LineUtils;
Expand Down Expand Up @@ -102,7 +102,7 @@ public void visitToken(SyntaxToken syntaxToken) {

private static boolean containsExcludedPattern(String comment) {
for (String excludePattern : EXCLUDED_PATTERNS) {
if (StringUtils.containsIgnoreCase(comment, excludePattern)) {
if (Strings.CI.contains(comment, excludePattern)) {
return true;
}
}
Expand Down
3 changes: 2 additions & 1 deletion java-surefire/src/main/java/org/sonar/plugins/surefire/SurefireJavaParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.annotation.CheckForNull;
import javax.xml.stream.XMLStreamException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.batch.ScannerSide;
Expand Down Expand Up @@ -107,7 +108,7 @@ private static void parseFiles(List<File> reports, UnitTestIndex index) {

private static void sanitize(UnitTestIndex index) {
for (String classname : index.getClassnames()) {
if (StringUtils.contains(classname, "$")) {
if (Strings.CS.contains(classname, "$")) {
// Surefire reports classes whereas sonar supports files
String parentClassName = StringUtils.substringBefore(classname, "$");
index.merge(classname, parentClassName);
Expand Down
3 changes: 2 additions & 1 deletion java-surefire/src/main/java/org/sonar/plugins/surefire/data/SurefireStaxHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Locale;
import javax.xml.stream.XMLStreamException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.codehaus.staxmate.in.ElementFilter;
import org.codehaus.staxmate.in.SMEvent;
import org.codehaus.staxmate.in.SMHierarchicCursor;
Expand Down Expand Up @@ -127,7 +128,7 @@ private static long getTimeAttributeInMS(String value) throws XMLStreamException
private static String getTestCaseName(SMInputCursor testCaseCursor) throws XMLStreamException {
String classname = testCaseCursor.getAttrValue("classname");
String name = testCaseCursor.getAttrValue("name");
if (StringUtils.contains(classname, "$")) {
if (Strings.CS.contains(classname, "$")) {
return StringUtils.substringAfter(classname, "$") + "/" + name;
}
return name;
Expand Down
4 changes: 2 additions & 2 deletions java-surefire/src/main/java/org/sonar/plugins/surefire/data/UnitTestClassReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;

public final class UnitTestClassReport {
private int errors = 0;
Expand All @@ -42,7 +42,7 @@ public UnitTestClassReport add(UnitTestClassReport other) {
public UnitTestClassReport add(UnitTestResult result) {
initResults();
boolean hasName = results.stream().map(UnitTestResult::getName).anyMatch(result.getName()::equals);
if (hasName && StringUtils.contains(result.getName(), "$")) {
if (hasName && Strings.CS.contains(result.getName(), "$")) {
return this;
}
results.add(result);
Expand Down