review feedback

Author: guwirth

cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java

@@ -68,7 +68,7 @@ public void visitFile(AstNode astNode) {
       int nr = 0;
 
       while ((line = br.readLine()) != null) {
-        nr++;
+        ++nr;
         Matcher matcher = DEFINE_DECLARATION_PATTERN.matcher(line);
         if (matcher.matches()) {
           String name = matcher.group(1);

cxx-checks/src/main/java/org/sonar/cxx/checks/UseCorrectIncludeCheck.java

@@ -64,7 +64,7 @@ public void visitFile(AstNode astNode) {
       int nr = 0;
 
       while ((line = br.readLine()) != null) {
-        nr++;
+        ++nr;
         if (PATTERN.matcher(line).find()) {
           getContext().createLineViolation(this, "Do not use relative path for #include directive.", nr);
         }

cxx-checks/src/main/java/org/sonar/cxx/checks/file/TabCharacterCheck.java

@@ -75,7 +75,7 @@ public void visitFile(AstNode astNode) {
       int nr = 0;
 
       while ((line = br.readLine()) != null) {
-        nr++;
+        ++nr;
         if (line.contains("\t")) {
           if (createLineViolation) {
             getContext().createLineViolation(this,

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

@@ -86,13 +86,8 @@ public void visitFile(AstNode astNode) {
       int nr = 0;
 
       while ((line = br.readLine()) != null) {
-        int length = 0;
-        nr++;
-        for (char c : line.toCharArray()) {
-          if (c == '\t') {
-            ++length;
-          }
-        }
+        ++nr;
+        long length = line.chars().filter(c -> c == '\t').count();
         length = line.length() + length * (tabWidth - 1);
         if (length > maximumLineLength) {
           getContext().createLineViolation(this,

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

@@ -37,7 +37,6 @@
 import org.sonar.cxx.visitors.CxxCharsetAwareVisitor;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.api.AnalysisException;
 import org.sonar.squidbridge.checks.SquidCheck;
 
 /**
@@ -82,7 +81,7 @@ public class FileHeaderCheck extends SquidCheck<Grammar> implements CxxCharsetAw
   private static boolean matches(String[] expectedLines, BufferedReader br) throws IOException {
     for (String expectedLine : expectedLines) {
       String line = br.readLine();
-      if (line == null || !line.equals(expectedLine)) {
+      if (!expectedLine.equals(line)) {
         return false;
       }
     }
@@ -105,26 +104,20 @@ public void init() {
 
   @Override
   public void visitFile(AstNode astNode) {
-    if (isRegularExpression) {
+    try {
+      // use onMalformedInput(CodingErrorAction.REPLACE) / onUnmappableCharacter(CodingErrorAction.REPLACE)
+      BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(getContext().getFile()), charset));
 
-      try {
-        // use onMalformedInput(CodingErrorAction.REPLACE) / onUnmappableCharacter(CodingErrorAction.REPLACE)
-        BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(getContext().getFile()), charset));
+      if (isRegularExpression) {
         String fileContent = br.lines().collect(Collectors.joining(System.lineSeparator()));
         checkRegularExpression(fileContent);
-      } catch (IOException e) {
-        throw new AnalysisException(e);
-      }
-    } else {
-      try {
-        // use onMalformedInput(CodingErrorAction.REPLACE) / onUnmappableCharacter(CodingErrorAction.REPLACE)
-        BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(getContext().getFile()), charset));
+      } else {
         if (!matches(expectedLines, br)) {
           getContext().createFileViolation(this, MESSAGE);
         }
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
       }
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
     }
   }
 

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

@@ -130,7 +130,7 @@ public void visitFile(AstNode fileNode) {
 
         while ((line = br.readLine()) != null) {
           Matcher matcher = pattern.matcher(line);
-          nr++;
+          ++nr;
           if (compare(invertRegularExpression, matcher.find())) {
             getContext().createLineViolation(this, message, nr);
           }