Merge pull request #2160 from guwirth/td-2

clean-up

Author: guwirth

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

@@ -25,11 +25,11 @@
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.cxx.api.CxxMetric;
-import org.sonar.cxx.tag.Tag;
 import org.sonar.cxx.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.cxx.squidbridge.annotations.SqaleConstantRemediation;
 import org.sonar.cxx.squidbridge.checks.ChecksHelper;
 import org.sonar.cxx.squidbridge.checks.SquidCheck;
+import org.sonar.cxx.tag.Tag;
 
 @Rule(
   key = "TooManyLinesOfCodeInFile",
@@ -55,10 +55,10 @@ public void setMax(int max) {
 
   @Override
   public void leaveFile(AstNode astNode) {
-    int linesOfCode = ChecksHelper.getRecursiveMeasureInt(getContext().peekSourceCode(), CxxMetric.LINES_OF_CODE);
+    var linesOfCode = ChecksHelper.getRecursiveMeasureInt(getContext().peekSourceCode(), CxxMetric.LINES_OF_CODE);
     if (linesOfCode > max) {
       getContext().createFileViolation(this, "This file has {0} lines of code, which is greater than {1} authorized. "
-        + "Split it into smaller files.", linesOfCode, max);
+                                               + "Split it into smaller files.", linesOfCode, max);
     }
   }
 

cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java

@@ -103,21 +103,21 @@ protected void processReport(File report)  {
     try {
       var f = new File(report.getPath());
 
-      NSDictionary rootDict = (NSDictionary) PropertyListParser.parse(f);
+      var rootDict = (NSDictionary) PropertyListParser.parse(f);
 
       NSObject[] diagnostics = ((NSArray) require(rootDict.objectForKey("diagnostics"),
                                                   "Missing mandatory entry 'diagnostics'")).getArray();
       NSObject[] sourceFiles = ((NSArray) require(rootDict.objectForKey("files"),
                                                   "Missing mandatory entry 'files'")).getArray();
 
       for (var diagnostic : diagnostics) {
-        NSDictionary diag = (NSDictionary) diagnostic;
+        var diag = (NSDictionary) diagnostic;
 
         String description = ((NSString) require(diag.get("description"),
                                                  "Missing mandatory entry 'diagnostics/description'")).getContent();
         String checkerName = ((NSString) require(diag.get("check_name"),
                                                  "Missing mandatory entry 'diagnostics/check_name'")).getContent();
-        NSDictionary location = (NSDictionary) require(diag.get("location"),
+        var location = (NSDictionary) require(diag.get("location"),
                                                        "Missing mandatory entry 'diagnostics/location'");
         var line = ((NSNumber) require(location.get("line"),
                                        "Missing mandatory entry 'diagnostics/location/line'")).intValue();

cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/cobertura/CoberturaParser.java

@@ -76,7 +76,7 @@ public static String join(Path path1, Path path2) {
       path2 = Paths.get(".", path2.toString());
     }
 
-    Path result = path1.resolve(path2).normalize();
+    var result = path1.resolve(path2).normalize();
     if (!result.isAbsolute()) {
       result = Paths.get(".", result.toString());
     }
@@ -89,7 +89,7 @@ private static void collectFileData(SMInputCursor clazz, CoverageMeasures builde
 
     while (line.getNext() != null) {
       var lineId = Integer.parseInt(line.getAttrValue("number"));
-      long noHits = Long.parseLong(line.getAttrValue("hits"));
+      var noHits = Long.parseLong(line.getAttrValue("hits"));
       if (noHits > Integer.MAX_VALUE) {
         LOG.warn("Truncating the actual number of hits ({}) to the maximum number supported by SonarQube ({})",
                  noHits, Integer.MAX_VALUE);

cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CppcheckParser.java

@@ -30,7 +30,6 @@
 import org.sonar.cxx.sensors.utils.EmptyReportException;
 import org.sonar.cxx.sensors.utils.StaxParser;
 import org.sonar.cxx.utils.CxxReportIssue;
-import org.sonar.cxx.utils.CxxReportLocation;
 
 public class CppcheckParser {
 
@@ -145,7 +144,7 @@ private void processErrorTag(SMInputCursor errorCursor) throws XMLStreamExceptio
             if (isLocationInProject) {
               issue.addLocation(file, line, null, info);
             } else {
-              CxxReportLocation primaryLocation = issue.getLocations().get(0);
+              var primaryLocation = issue.getLocations().get(0);
               String primaryFile = primaryLocation.getFile();
               String primaryLine = primaryLocation.getLine();
 

cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensor.java

@@ -40,7 +40,6 @@
 import org.sonar.cxx.sensors.utils.InvalidReportException;
 import org.sonar.cxx.sensors.utils.StaxParser;
 import org.sonar.cxx.utils.CxxReportIssue;
-import org.sonar.cxx.utils.CxxReportLocation;
 
 /**
  * PC-lint is an equivalent to pmd but for C++ The first version of the tool was release 1985 and the tool analyzes
@@ -182,7 +181,7 @@ private void addSecondaryLocationsToCurrentIssue(@Nonnull CxxReportIssue current
 
         // Due to SONAR-9929, even the API supports the extra/flow in different file,
         // the UI is not ready. For this case, use the parent issue's file and line for now.
-        CxxReportLocation primaryLocation = currentIssue.getLocations().get(0);
+        var primaryLocation = currentIssue.getLocations().get(0);
         if (!primaryLocation.getFile().equals(file)) {
           if (msg != null && !msg.startsWith(PREFIX_DURING_SPECIFIC_WALK_MSG)) {
             msg = String.format("%s %s:%s %s", PREFIX_DURING_SPECIFIC_WALK_MSG, file, line, msg);

cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsSensor.java

@@ -87,7 +87,7 @@ protected void processReport(File report) {
       var builder = new SAXBuilder(XMLReaders.NONVALIDATING);
       builder.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
       builder.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
-      Element root = builder.build(report).getRootElement();
+      var root = builder.build(report).getRootElement();
 
       List<Element> vulnerabilities = root.getChildren("vulnerability");
       for (var vulnerability : vulnerabilities) {

cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/dotnet/CxxUnitTestResultsImportSensor.java

@@ -92,8 +92,8 @@ public void execute(SensorContext context) {
   }
 
   public void analyze(UnitTestResults unitTestResults, UnitTestConfiguration unitTestConf) {
-    UnitTestResults aggregatedResults = unitTestResultsAggregator.aggregate(wildcardPatternFileProvider,
-                                                                            unitTestResults, unitTestConf);
+    var aggregatedResults = unitTestResultsAggregator.aggregate(wildcardPatternFileProvider,
+                                                            unitTestResults, unitTestConf);
     if (aggregatedResults != null) {
       saveMetric(CoreMetrics.TESTS, aggregatedResults.tests());
       saveMetric(CoreMetrics.TEST_ERRORS, aggregatedResults.errors());

cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/dotnet/NUnitTestResultsFileParser.java

@@ -68,7 +68,7 @@ private static Double readExecutionTimeFromDirectlyNestedTestSuiteTags(XmlParser
       while ((tag = xmlParserHelper.nextStartOrEndTag()) != null) {
         if ("<test-suite>".equals(tag)) {
           level++;
-          Double time = xmlParserHelper.getDoubleAttribute("time");
+          var time = xmlParserHelper.getDoubleAttribute("time");
 
           if (level == 1 && time != null) {
             if (executionTime == null) {

cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/xunit/XunitReportParser.java

@@ -90,20 +90,19 @@ private void parseTestCaseTag(SMInputCursor testCaseCursor, String tsName, Strin
     var status = "ok";
     var stack = "";
     var msg = "";
-    final String SKIPPED_STATUS = "skipped";
 
     // Googletest-reports mark the skipped tests with status="notrun"
     String statusattr = testCaseCursor.getAttrValue("status");
     if ("notrun".equals(statusattr)) {
-      status = SKIPPED_STATUS;
+      status = "skipped";
     } else {
       SMInputCursor childCursor = testCaseCursor.childElementCursor();
       if (childCursor.getNext() != null) {
         String elementName = childCursor.getLocalName();
         if (null != elementName) {
           switch (elementName) {
-            case SKIPPED_STATUS:
-              status = SKIPPED_STATUS;
+            case "skipped":
+              status = "skipped";
               break;
             case "failure":
               status = "failure";
@@ -123,7 +122,7 @@ private void parseTestCaseTag(SMInputCursor testCaseCursor, String tsName, Strin
     }
 
     String filename = tcFilename != null ? tcFilename : tsFilename;
-    TestFile file = getTestFile(filename);
+    var file = getTestFile(filename);
     file.add(new TestCase(name, time.intValue(), status, stack, msg, classname, filename, tsName));
   }
 
@@ -132,7 +131,7 @@ private TestFile getTestFile(String filename) {
     if (absolute != null) {
       absolute = absolute.toLowerCase();
     }
-    TestFile file = testFiles.get(absolute);
+    var file = testFiles.get(absolute);
     if (file == null) {
       file = new TestFile(absolute);
       testFiles.put(absolute, file);
@@ -151,7 +150,7 @@ private String parseTestCaseName(SMInputCursor testCaseCursor) throws XMLStreamE
 
   private double parseTime(SMInputCursor testCaseCursor)
     throws XMLStreamException {
-    double time = 0.0;
+    var time = 0.0;
     try {
       String sTime = testCaseCursor.getAttrValue("time");
       if (sTime != null && !sTime.isEmpty()) {

cxx-sensors/src/main/java/org/sonar/cxx/sensors/utils/CxxIssuesReportSensor.java

@@ -75,7 +75,7 @@ public void executeImpl() {
   public void saveUniqueViolation(CxxReportIssue issue) {
     if (uniqueIssues.add(issue)) {
       try {
-        NewIssue newIssue = context.newIssue();
+        var newIssue = context.newIssue();
         if (addLocations(newIssue, issue)) {
           addFlow(newIssue, issue);
           newIssue.save();
@@ -169,7 +169,7 @@ private boolean addLocations(NewIssue newIssue, CxxReportIssue issue) {
   private void addFlow(NewIssue newIssue, CxxReportIssue issue) {
     var newIssueFlow = new ArrayList<NewIssueLocation>();
     for (var location : issue.getFlow()) {
-      NewIssueLocation newIssueLocation = createNewIssueLocation(newIssue, location);
+      var newIssueLocation = createNewIssueLocation(newIssue, location);
       if (newIssueLocation != null) {
         newIssueFlow.add(newIssueLocation);
       } else {