Merge pull request #2791 from guwirth/td-9

fix technical debt

Author: guwirth

cxx-checks/src/main/java/org/sonar/cxx/checks/metrics/CxxCyclomaticComplexityCheck.java

@@ -67,7 +67,7 @@ public void visitFile(@Nullable AstNode astNode) {
   }
 
   @Override
-  public void leaveFile(AstNode astNode) {
+  public void leaveFile(@Nullable AstNode astNode) {
     if (!getScopeType().isPresent()) {
       analyzeScopeComplexity();
     }

cxx-checks/src/main/java/org/sonar/cxx/checks/metrics/TooManyLinesOfCodeInFileCheck.java

@@ -21,6 +21,7 @@
 
 import com.sonar.cxx.sslr.api.AstNode;
 import com.sonar.cxx.sslr.api.Grammar;
+import javax.annotation.Nullable;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -54,7 +55,7 @@ public void setMax(int max) {
   }
 
   @Override
-  public void leaveFile(AstNode astNode) {
+  public void leaveFile(@Nullable AstNode astNode) {
     var linesOfCode = ChecksHelper.getRecursiveMeasureInt(getContext().peekSourceCode(), CxxMetric.LINES_OF_CODE);
     if (linesOfCode > max) {
       getContext().createFileViolation(this,

cxx-checks/src/main/java/org/sonar/cxx/checks/regex/FileRegularExpressionCheck.java

@@ -22,6 +22,7 @@
 import com.sonar.cxx.sslr.api.AstNode;
 import com.sonar.cxx.sslr.api.Grammar;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.WildcardPattern;
 import org.sonar.check.Priority;
@@ -106,7 +107,7 @@ public void init() {
   }
 
   @Override
-  public void visitFile(AstNode fileNode) {
+  public void visitFile(@Nullable AstNode fileNode) {
     if (!compare(invertFilePattern, matchFile())) {
       return;
     }

cxx-checks/src/main/java/org/sonar/cxx/checks/regex/LineRegularExpressionCheck.java

@@ -22,6 +22,7 @@
 import com.sonar.cxx.sslr.api.AstNode;
 import com.sonar.cxx.sslr.api.Grammar;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.WildcardPattern;
 import org.sonar.check.Priority;
@@ -106,7 +107,7 @@ public void init() {
   }
 
   @Override
-  public void visitFile(AstNode fileNode) {
+  public void visitFile(@Nullable AstNode fileNode) {
     if (compare(invertFilePattern, matchFile())) {
       var nr = 0;
       for (var line : getContext().getInputFileLines()) {

cxx-checks/src/main/java/org/sonar/cxx/checks/xpath/XPathCheck.java

@@ -21,6 +21,7 @@
 
 import com.sonar.cxx.sslr.api.AstNode;
 import com.sonar.cxx.sslr.api.Grammar;
+import javax.annotation.Nullable;
 import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.WildcardPattern;
 import org.sonar.check.Priority;
@@ -83,7 +84,7 @@ public String getMessage() {
   }
 
   @Override
-  public void visitFile(AstNode fileNode) {
+  public void visitFile(@Nullable AstNode fileNode) {
     if (!matchFilePattern.isEmpty()) {
       var pattern = WildcardPattern.create(matchFilePattern);
       String path = PathUtils.sanitize(getContext().getFile().getPath());

cxx-checks/src/test/java/org/sonar/cxx/checks/metrics/ClassComplexityCheckTest.java

@@ -44,8 +44,9 @@ void test() throws IOException {
     Set<CxxReportIssue> issues = MultiLocatitionSquidCheck.getMultiLocationCheckMessages(file);
     assertThat(issues).isNotNull();
     var softly = new SoftAssertions();
-    softly.assertThat(issues).hasSize(3);
-    softly.assertThat(issues).allSatisfy(issue -> assertThat(issue.getRuleId()).isEqualTo("ClassComplexity"));
+    softly.assertThat(issues)
+      .hasSize(3)
+      .allSatisfy(issue -> assertThat(issue.getRuleId()).isEqualTo("ClassComplexity"));
 
     CxxReportIssue issue0 = issues.stream().filter(issue -> issue.getLocations().get(0).getLine().equals("9"))
       .findFirst().orElseThrow(() -> new AssertionError("No issue at line 9"));

cxx-checks/src/test/java/org/sonar/cxx/checks/metrics/FunctionCognitiveComplexityCheckTest.java

@@ -43,8 +43,8 @@ void check() throws IOException {
     assertThat(issues).isNotNull();
 
     var softly = new SoftAssertions();
-    softly.assertThat(issues).hasSize(5);
     softly.assertThat(issues)
+      .hasSize(5)
       .allSatisfy(issue -> assertThat(issue.getRuleId()).isEqualTo("FunctionCognitiveComplexity"));
 
     CxxReportIssue issue0 = issues.stream().filter(issue -> issue.getLocations().get(0).getLine().equals("13"))

cxx-checks/src/test/java/org/sonar/cxx/checks/metrics/FunctionComplexityCheckTest.java

@@ -39,8 +39,9 @@ void check() throws IOException {
     var issues = MultiLocatitionSquidCheck.getMultiLocationCheckMessages(file);
     assertThat(issues).isNotNull();
     var softly = new SoftAssertions();
-    softly.assertThat(issues).hasSize(5);
-    softly.assertThat(issues).allSatisfy(issue -> assertThat(issue.getRuleId()).isEqualTo("FunctionComplexity"));
+    softly.assertThat(issues)
+      .hasSize(5)
+      .allSatisfy(issue -> assertThat(issue.getRuleId()).isEqualTo("FunctionComplexity"));
 
     var issue0 = issues.stream()
       .filter(issue -> issue.getLocations().get(0).getLine().equals("13"))

cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensor.java

@@ -60,7 +60,7 @@ protected void processReport(File report) {
     try (var scanner = new TextScanner(report, reportEncoding)) {
       var pattern = Pattern.compile(reportRegEx);
       LOG.debug("Processing '{}' report '{}', Encoding='{}', Pattern='{}'",
-                getCompilerKey(), report, scanner.encoding(), pattern);
+        getCompilerKey(), report, scanner.encoding(), pattern);
 
       while (scanner.hasNextLine()) {
         var matcher = pattern.matcher(scanner.nextLine());
@@ -117,8 +117,8 @@ protected void processReport(File report) {
    * @return true, if valid
    */
   protected boolean isInputValid(@Nullable String filename,
-                                 @Nullable String line, @Nullable String column,
-                                 @Nullable String id, String msg) {
+    @Nullable String line, @Nullable String column,
+    @Nullable String id, String msg) {
     if ((id == null) || id.isEmpty()) {
       return false;
     }
@@ -193,7 +193,7 @@ private String getSubSequence(Matcher matcher, String groupName) {
       }
     } catch (IllegalArgumentException e) {
       notExistingGroupName.add(groupName);
-      LOG.debug("named-capturing group '{}' is not used in regex.", groupName);
+      LOG.debug("named-capturing group '{}' is not used in regex.", groupName, e);
     }
     return null;
   }

cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CoverageMeasures.java

@@ -62,7 +62,7 @@ Collection<CoverageMeasure> getCoverageMeasures() {
 
   public Set<Integer> getCoveredLines() {
     var coveredLines = new HashSet<Integer>();
-    lineMeasures.forEach((key, value) -> {
+    lineMeasures.forEach((Integer key, CoverageMeasure value) -> {
       if (value.getHits() != 0) {
         coveredLines.add(value.getLine());
       }
@@ -72,7 +72,7 @@ public Set<Integer> getCoveredLines() {
 
   public Set<Integer> getCoveredConditions() {
     var coveredConditionLines = new HashSet<Integer>();
-    lineMeasures.forEach((key, value) -> {
+    lineMeasures.forEach((Integer key, CoverageMeasure value) -> {
       if (value.getCoveredConditions() != 0) {
         coveredConditionLines.add(value.getLine());
       }