From 7c33070b0c28bb80e36a98e448287c6808d5380b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Coet?= Date: Thu, 22 Oct 2026 09:12:06 +0200 Subject: [PATCH] Fix SonarQube issues --- .../sonar/java/checks/verifier/internal/Expectations.java | 2 +- .../org/sonar/java/checks/MarkdownJavadocSyntaxCheck.java | 2 +- .../main/java/org/sonar/java/checks/OctalValuesCheck.java | 6 +++--- .../sonar/java/checks/OneClassInterfacePerFileCheck.java | 2 +- .../src/main/java/org/sonar/java/ExecutionTimeReport.java | 2 +- .../src/main/java/org/sonar/java/model/JParser.java | 2 +- .../sonar/plugins/surefire/data/SurefireStaxHandler.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java index 4ce62581b8c..d95ce9d53ac 100644 --- a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java +++ b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java @@ -170,7 +170,7 @@ private int compareTo(FlowComment other) { } if (thisOrder == null && otherOrder == null) { int compareLines = Integer.compare(line, other.line); - return compareLines != 0 ? compareLines : Integer.compare(startColumn, other.startColumn); + return compareLines == 0 ? Integer.compare(startColumn, other.startColumn) : compareLines; } throw new AssertionError("Mixed explicit and implicit order in same flow." + System.lineSeparator() + this + System.lineSeparator() + other); } diff --git a/java-checks/src/main/java/org/sonar/java/checks/MarkdownJavadocSyntaxCheck.java b/java-checks/src/main/java/org/sonar/java/checks/MarkdownJavadocSyntaxCheck.java index 795bc9c0993..90e2c3f017d 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/MarkdownJavadocSyntaxCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/MarkdownJavadocSyntaxCheck.java @@ -141,7 +141,7 @@ static int findEndOfMarkdownQuote(String javadoc, int startPosition) { matcher.region(startPosition, javadoc.length()); if (matcher.lookingAt()) { boolean closingQuotesFound = matcher.find(startPosition + 3); - return !closingQuotesFound ? -1 : matcher.end(); + return closingQuotesFound ? matcher.end() : -1; } else { int closingQuotePosition = javadoc.indexOf("`", startPosition + 1); return closingQuotePosition == -1 ? -1 : (closingQuotePosition + 1); diff --git a/java-checks/src/main/java/org/sonar/java/checks/OctalValuesCheck.java b/java-checks/src/main/java/org/sonar/java/checks/OctalValuesCheck.java index c1fe4846f10..d2bd21e1b6b 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/OctalValuesCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/OctalValuesCheck.java @@ -69,9 +69,9 @@ private static String toSymbolicPermissions(String value) { StringBuilder sb = new StringBuilder(); for (char digit : value.substring(1).toCharArray()) { int bits = digit - '0'; - sb.append((bits & 4) != 0 ? 'r' : '-') - .append((bits & 2) != 0 ? 'w' : '-') - .append((bits & 1) != 0 ? 'x' : '-'); + sb.append((bits & 4) == 0 ? '-' : 'r') + .append((bits & 2) == 0 ? '-' : 'w') + .append((bits & 1) == 0 ? '-' : 'x'); } return sb.toString(); } diff --git a/java-checks/src/main/java/org/sonar/java/checks/OneClassInterfacePerFileCheck.java b/java-checks/src/main/java/org/sonar/java/checks/OneClassInterfacePerFileCheck.java index a2576924cbd..8d22e36ef77 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/OneClassInterfacePerFileCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/OneClassInterfacePerFileCheck.java @@ -38,7 +38,7 @@ public void visitNode(Tree tree) { int types = ((CompilationUnitTree) tree).types().size(); if (types > 1) { context.addIssue( - -1, OneClassInterfacePerFileCheck.this, "There are " + types + " top-level types in this file; move all but one of them to other files.", types - 1); + -1, this, "There are " + types + " top-level types in this file; move all but one of them to other files.", types - 1); } } diff --git a/java-frontend/src/main/java/org/sonar/java/ExecutionTimeReport.java b/java-frontend/src/main/java/org/sonar/java/ExecutionTimeReport.java index 26d1d97ec08..1c8cd3fb1eb 100644 --- a/java-frontend/src/main/java/org/sonar/java/ExecutionTimeReport.java +++ b/java-frontend/src/main/java/org/sonar/java/ExecutionTimeReport.java @@ -47,7 +47,7 @@ public ExecutionTime(String file, long analysisTime, long lengthInBytes) { private static final Comparator ORDER_BY_ANALYSIS_TIME_DESCENDING_AND_FILE_ASCENDING = (a, b) -> { int compare = Long.compare(b.analysisTime, a.analysisTime); - return compare != 0 ? compare : a.file.compareTo(b.file); + return compare == 0 ? a.file.compareTo(b.file) : compare; }; private final LinkedList recordedOrderedExecutionTime = new LinkedList<>(); diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParser.java b/java-frontend/src/main/java/org/sonar/java/model/JParser.java index 0b28c7ba0ce..e58aeb7f024 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/JParser.java +++ b/java-frontend/src/main/java/org/sonar/java/model/JParser.java @@ -307,7 +307,7 @@ static JavaTree.CompilationUnitTreeImpl convert(String version, String unitName, .filter(IS_UNDEFINED_TYPE_ERROR) .map(i -> new JProblem( i.getMessage(), - (i.getID() & IProblem.PreviewFeatureUsed) != 0 ? JProblem.Type.PREVIEW_FEATURE_USED : JProblem.Type.UNDEFINED_TYPE)) + (i.getID() & IProblem.PreviewFeatureUsed) == 0 ? JProblem.Type.UNDEFINED_TYPE : JProblem.Type.PREVIEW_FEATURE_USED)) .collect(Collectors.toSet()); JParser converter = new JParser(); diff --git a/java-surefire/src/main/java/org/sonar/plugins/surefire/data/SurefireStaxHandler.java b/java-surefire/src/main/java/org/sonar/plugins/surefire/data/SurefireStaxHandler.java index 2c25bfabf93..a9c04698d1f 100644 --- a/java-surefire/src/main/java/org/sonar/plugins/surefire/data/SurefireStaxHandler.java +++ b/java-surefire/src/main/java/org/sonar/plugins/surefire/data/SurefireStaxHandler.java @@ -119,7 +119,7 @@ private static long getTimeAttributeInMS(String value) throws XMLStreamException // hardcoded to Locale.ENGLISH see http://jira.codehaus.org/browse/SONAR-602 try { Double time = ParsingUtils.parseNumber(value, Locale.ENGLISH); - return !Double.isNaN(time) ? (long) ParsingUtils.scaleValue(time * 1000, 3) : 0L; + return Double.isNaN(time) ? 0L : (long) ParsingUtils.scaleValue(time * 1000, 3); } catch (ParseException e) { throw new XMLStreamException(e); }