Merge pull request #1114 from Bertk/fixes2

fix sonarlint issues and reduce false positives
SonarOpenCommunity · Apr 22, 2017 · ae0bbc2 · ae0bbc2
2 parents 9438182 + b416d6c
commit ae0bbc2
Show file tree

Hide file tree

Showing 79 changed files with 668 additions and 529 deletions.
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentContainsPatternChecker.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentContainsPatternChecker.java
@@ -72,7 +72,7 @@ public void visitToken(Token token) {
         for (int i = 0; i < lines.length; i++) {
           int start = indexOfIgnoreCase(lines[i]);
           if (start != -1 && !isLetterAround(lines[i], start)) {
-            check.getContext().createLineViolation(check, message, trivia.getToken().getLine() + i);
+            check.getContext().createLineViolation(check, message, trivia.getToken().getLine() + i); //NOSONAR
           }
         }
       }

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentedCodeCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CommentedCodeCheck.java
@@ -44,8 +44,8 @@
 @Rule(
   key = "CommentedCode",
   name = "Sections of code should not be 'commented out'",
-  tags = {Tag.UNUSED},
-  priority = Priority.BLOCKER)
+  tags = {Tag.BAD_PRACTICE},
+  priority = Priority.CRITICAL)
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 public class CommentedCodeCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor {
@@ -74,15 +74,14 @@ public Set<Detector> getDetectors() {
   @Override
   public void visitToken(Token token) {
     for (Trivia trivia : token.getTrivia()) {
-      if (trivia.isComment()
+      if (trivia.isComment() //NOSONAR
         && !trivia.getToken().getOriginalValue().startsWith("///")
         && !trivia.getToken().getOriginalValue().startsWith("//!")
-        && !trivia.getToken().getOriginalValue().startsWith("/**")
+        && !trivia.getToken().getOriginalValue().startsWith("/**") //NOSONAR
         && !trivia.getToken().getOriginalValue().startsWith("/*!")
-        && !trivia.getToken().getOriginalValue().startsWith("/*@")
+        && !trivia.getToken().getOriginalValue().startsWith("/*@") //NOSONAR
         && !trivia.getToken().getOriginalValue().startsWith("//@")) {
-        String lines[] = regexpToDivideStringByLine.split(getContext().getCommentAnalyser().getContents(
-          trivia.getToken().getOriginalValue()));
+        String lines[] = regexpToDivideStringByLine.split(getContext().getCommentAnalyser().getContents(trivia.getToken().getOriginalValue())); //NOSONAR
 
         for (int lineOffset = 0; lineOffset < lines.length; lineOffset++) {
           if (codeRecognizer.isLineOfCode(lines[lineOffset])) {

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileEncodingCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileEncodingCheck.java
@@ -37,7 +37,7 @@
   priority = Priority.MINOR)
 @ActivatedByDefault
 @NoSqale
-public class FileEncodingCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class FileEncodingCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private Charset charset;
 
@@ -50,7 +50,7 @@ public void setCharset(Charset charset) {
   public void visitFile(AstNode astNode) {
     try {
       Files.readAllLines(getContext().getFile().toPath(), charset);
-    } catch (IOException e) {
+    } catch (IOException e) { //NOSONAR
       getContext().createFileViolation(this, "Not all characters of the file can be encoded with the predefined charset " + charset.name() + ".");
     }
   }

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileHeaderCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileHeaderCheck.java
@@ -49,7 +49,7 @@
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule T013 "No copyright notice found"
-public class FileHeaderCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class FileHeaderCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private static final String DEFAULT_HEADER_FORMAT = "";
   private static final String MESSAGE = "Add or update the header of this file.";
@@ -105,7 +105,7 @@ public void visitFile(AstNode astNode) {
       List<String> lines;
       try {
         lines = Files.readLines(getContext().getFile(), charset);
-      } catch (IOException e) {
+      } catch (IOException e) { //NOSONAR
         throw new IllegalStateException(e);
       }
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/FileRegularExpressionCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/FileRegularExpressionCheck.java
@@ -28,14 +28,16 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
 import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.WildcardPattern;
 import org.sonar.squidbridge.annotations.NoSqale;
@@ -47,7 +49,7 @@
   priority = Priority.MAJOR)
 @RuleTemplate
 @NoSqale
-public class FileRegularExpressionCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class FileRegularExpressionCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private static final String DEFAULT_MATCH_FILE_PATTERN = "";
   private static final boolean DEFAULT_INVERT_FILE_PATTERN = false;
@@ -96,8 +98,10 @@ public void init() {
       decoder = charset.newDecoder();
       decoder.onMalformedInput(CodingErrorAction.REPLACE);
       decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
-    } catch (Exception e) {
-      throw new IllegalStateException(e);
+    } catch (PatternSyntaxException ex) {
+      throw new IllegalStateException(ex);
+    } catch (IllegalArgumentException ex2) {
+      throw new IllegalStateException(ex2);
     }
   }
 
@@ -108,7 +112,6 @@ public void setCharset(Charset charset) {
 
   @Override
   public void visitFile(AstNode fileNode) {
-    if (fileNode != null) {
       try {
         if (!compare(invertFilePattern, matchFile())) {
           return;
@@ -117,11 +120,10 @@ public void visitFile(AstNode fileNode) {
         if (compare(invertRegularExpression, matcher.find())) {
           getContext().createFileViolation(this, message);
         }
-      } catch (Exception e) {
-        throw new IllegalStateException(e);
+      } catch (Exception e) { //NOSONAR
+        throw new IllegalStateException(e); 
       }
     }
-  }
 
   private boolean matchFile() {
     if (!matchFilePattern.isEmpty()) {
@@ -132,18 +134,11 @@ private boolean matchFile() {
     return true;
   }
 
-  private CharSequence fromFile(File file) throws Exception {
-    FileInputStream input = null;
-    try {
-      input = new FileInputStream(file);
+  private CharSequence fromFile(File file) throws IOException  {
+    try (FileInputStream input = new FileInputStream(file)) {
       FileChannel channel = input.getChannel();
       ByteBuffer bbuf = channel.map(FileChannel.MapMode.READ_ONLY, 0, (int) channel.size());
-      CharBuffer cbuf = decoder.decode(bbuf);
-      return cbuf;
-    } finally {
-      if (input != null) {
-        input.close();
-      }
+      return decoder.decode(bbuf);
     }
   }
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedAccountCheck.java
@@ -53,7 +53,7 @@ public class HardcodedAccountCheck extends SquidCheck<Grammar> {
    *
    */
   private static final String DEFAULT_REGULAR_EXPRESSION = "\\bDSN\\b.*=.*;\\b(UID|PWD)\\b=.*;";
-  private static Matcher reg;
+  private static volatile Matcher reg = null;
 
   @RuleProperty(
     key = "regularExpression",

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedIpCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/HardcodedIpCheck.java
@@ -30,10 +30,8 @@
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import org.sonar.cxx.tag.Tag;
 
 @Rule(
@@ -42,7 +40,6 @@
   tags = {Tag.CERT, Tag.SECURITY},
   priority = Priority.CRITICAL)
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.ARCHITECTURE_CHANGEABILITY)
 @SqaleConstantRemediation("30min")
 public class HardcodedIpCheck extends SquidCheck<Grammar> {
 
@@ -53,7 +50,7 @@ public class HardcodedIpCheck extends SquidCheck<Grammar> {
 // IPv4 with port number
 //  (?:^|\s)([a-z]{3,6}(?=://))?(://)?((?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?))(?::(\d{2,5}))?(?:\s|$)
   private static final String DEFAULT_REGULAR_EXPRESSION = "^.*((?<![\\d|\\.])(?:\\b(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b\\.){3}\\b(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b(?!\\d|\\.)).*$";
-  private static Matcher IP;
+  private static volatile Matcher IP = null;
 
   @RuleProperty(
     key = "regularExpression",

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/LineRegularExpressionCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/LineRegularExpressionCheck.java
@@ -47,7 +47,7 @@
   priority = Priority.MAJOR)
 @RuleTemplate
 @NoSqale
-public class LineRegularExpressionCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class LineRegularExpressionCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private static final String DEFAULT_MATCH_FILE_PATTERN = "";
   private static final boolean DEFAULT_INVERT_FILE_PATTERN = false;
@@ -104,7 +104,6 @@ public void setCharset(Charset charset) {
 
   @Override
   public void visitFile(AstNode fileNode) {
-    if (fileNode != null) {
       if (compare(invertFilePattern, matchFile())) {
         List<String> lines;
         try {
@@ -120,7 +119,6 @@ public void visitFile(AstNode fileNode) {
         }
       }
     }
-  }
 
   private boolean matchFile() {
     if (!matchFilePattern.isEmpty()) {

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/MagicNumberCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/MagicNumberCheck.java
@@ -104,7 +104,7 @@ private boolean isConst(AstNode node) {
     }
     if (decl != null) {
       for (AstNode qualifier : decl.getDescendants(CxxGrammarImpl.cvQualifier)) {
-        if (qualifier.getToken().getType() == CxxKeyword.CONST) {
+        if (qualifier.getToken().getType().equals(CxxKeyword.CONST)) {
           return true;
         }
       }

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingNewLineAtEndOfFileCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/MissingNewLineAtEndOfFileCheck.java
@@ -21,6 +21,8 @@
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.nio.charset.StandardCharsets;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.squidbridge.checks.SquidCheck;
@@ -61,7 +63,7 @@ private boolean endsWithNewline(RandomAccessFile randomAccessFile) throws IOExce
     if (randomAccessFile.read(chars) < 1) {
       return false;
     }
-    String ch = new String(chars);
+    String ch = new String(chars, StandardCharsets.UTF_8);
     return "\n".equals(ch) || "\r".equals(ch);
   }
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/NestedStatementsCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/NestedStatementsCheck.java
@@ -45,7 +45,7 @@
 )
 @ActivatedByDefault
 @SqaleConstantRemediation("10min")
-public class NestedStatementsCheck extends SquidCheck<Grammar> {
+public class NestedStatementsCheck extends SquidCheck<Grammar> { //NOSONAR
 
   private static final AstNodeType[] CHECKED_TYPES = new AstNodeType[]{
     CxxGrammarImpl.selectionStatement,
@@ -55,8 +55,6 @@ public class NestedStatementsCheck extends SquidCheck<Grammar> {
 
   private static final int DEFAULT_MAX = 3;
 
-  private static final String ELSE_TOKEN = "ELSE";
-
   @RuleProperty(
     key = "max",
     description = "Maximum allowed control flow statement nesting depth.",
@@ -99,7 +97,7 @@ public void visitNode(AstNode node) {
       nestingLevel--;
     }
 
-    // Prevent re-checking of descendent nodes
+    // Prevent re-checking of descendant nodes
     checkedNodes.addAll(watchedDescendants);
   }
 
@@ -113,6 +111,6 @@ private void visitChildren(List<AstNode> watchedDescendants) {
    * @return True if the given node is the 'if' in an 'else if' construct.
    */
   private boolean isElseIf(AstNode node) {
-    return isIfStatement(node) && node.getParent().getPreviousAstNode().getType()==CxxKeyword.ELSE;
+    return isIfStatement(node) && node.getParent().getPreviousAstNode().getType().equals(CxxKeyword.ELSE);
   }
 }
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/ParsingErrorCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/ParsingErrorCheck.java
@@ -23,6 +23,7 @@
 import java.io.StringWriter;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
+import org.sonar.cxx.tag.Tag;
 import org.sonar.squidbridge.AstScannerExceptionHandler;
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.Grammar;
@@ -33,6 +34,7 @@
 @Rule(
   key = "ParsingError",
   name = "C++ parser failure",
+  tags = {Tag.TOOL_ERROR},
   priority = Priority.MAJOR)
 @ActivatedByDefault
 @NoSqale

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/ParsingErrorRecoveryCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/ParsingErrorRecoveryCheck.java
@@ -22,6 +22,7 @@
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.parser.CxxGrammarImpl;
+import org.sonar.cxx.tag.Tag;
 import org.sonar.squidbridge.checks.SquidCheck;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
@@ -31,6 +32,7 @@
 @Rule(
   key = "ParsingErrorRecovery",
   name = "C++ skip parser error",
+  tags = {Tag.TOOL_ERROR},  
   priority = Priority.INFO)
 @ActivatedByDefault
 @NoSqale

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java
@@ -46,9 +46,9 @@
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule T002
-public class ReservedNamesCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class ReservedNamesCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
-  private static String[] keywords;
+  private static volatile String[] keywords = null;
   private Charset charset;
 
   @Override

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/SafetyTagCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/SafetyTagCheck.java
@@ -42,7 +42,7 @@
   tags = {Tag.CONVENTION})
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
-public class SafetyTagCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor {
+public class SafetyTagCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor { //NOSONAR
 
   private static final String DEFAULT_REGULAR_EXPRESSION = "<Safetykey>.*</Safetykey>";
   private static final String DEFAULT_MESSAGE = "Source files implementing risk mitigations shall use special name suffix";

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/SwitchLastCaseIsDefaultCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/SwitchLastCaseIsDefaultCheck.java
@@ -38,7 +38,7 @@
   key = "SwitchLastCaseIsDefault",
   name = "Switch statements should end with a default case",
   priority = Priority.MAJOR,
-  tags = {Tag.PITFALL})
+  tags = {Tag.BAD_PRACTICE, Tag.PITFALL})
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 public class SwitchLastCaseIsDefaultCheck extends SquidCheck<Grammar> {

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/TabCharacterCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/TabCharacterCheck.java
@@ -45,7 +45,7 @@
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule L002 "Don't use tab characters"
-public class TabCharacterCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class TabCharacterCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private static final boolean DEFAULT_CREATE_LINE_VIOLATION = false;
 

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/TooLongLineCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/TooLongLineCheck.java
@@ -45,7 +45,7 @@
 @ActivatedByDefault
 @SqaleConstantRemediation("5min")
 //similar Vera++ rule L004 "Line too long"
-public class TooLongLineCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor {
+public class TooLongLineCheck extends SquidCheck<Grammar> implements CxxCharsetAwareVisitor { //NOSONAR
 
   private static final int DEFAULT_MAXIMUM_LINE_LENHGTH = 160;
   private static final int DEFAULT_TAB_WIDTH = 8;

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/TooManyLinesOfCodeInFunctionCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/TooManyLinesOfCodeInFunctionCheck.java
@@ -21,7 +21,6 @@
 
 import java.util.List;
 
-import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -30,7 +29,6 @@
 import org.sonar.cxx.tag.Tag;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import org.sonar.squidbridge.checks.SquidCheck;
@@ -40,9 +38,8 @@
       priority = Priority.MAJOR,
       tags = {Tag.BRAIN_OVERLOAD})
 @ActivatedByDefault
-@SqaleSubCharacteristic(RulesDefinition.SubCharacteristics.READABILITY)
 @SqaleConstantRemediation("1h")
-public class TooManyLinesOfCodeInFunctionCheck extends SquidCheck<Grammar> {
+public class TooManyLinesOfCodeInFunctionCheck extends SquidCheck<Grammar> { //NOSONAR
   private static final int DEFAULT_MAXIMUM = 200;
 
 @RuleProperty(