Remove use of internal class DefaultIssueLocation

Timothy G. Rundle · Timothy G. Rundle · commit 69a9b526639e · 2019-01-10T14:21:20.000-05:00
diff --git a/objclang/src/main/java/com/backelite/sonarqube/objectivec/ObjectiveCSquidSensor.java b/objclang/src/main/java/com/backelite/sonarqube/objectivec/ObjectiveCSquidSensor.java
@@ -33,7 +33,6 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.scan.filesystem.PathResolver;
@@ -99,16 +98,21 @@ private void saveIssues(InputFile inputFile, SourceFile squidFile) {
         if (inputFile != null) {
             for (CheckMessage message : messages) {
                 RuleKey ruleKey = checks.ruleKey((SquidCheck<ObjectiveCGrammar>) message.getCheck());
-                NewIssue issue = context.newIssue()
-                    .forRule(ruleKey);
-                NewIssueLocation dil = new DefaultIssueLocation()
-                    .on(inputFile)
-                    .at(inputFile.selectLine(message.getLine()))
-                    .message(message.getText(Locale.ENGLISH));
-                issue.at(dil);
+                NewIssue issue = context.newIssue();
+
+                NewIssueLocation issueLocation = issue.newLocation()
+                        .message(message.getText(Locale.ENGLISH))
+                        .on(inputFile)
+                        .at(inputFile.selectLine(message.getLine()));
+
+                issue
+                        .forRule(ruleKey)
+                        .at(issueLocation);
+
                 if (message.getCost() != null) {
                     issue.gap(message.getCost());
                 }
+
                 issue.save();
             }
         }
diff --git a/objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/fauxpas/FauxPasReportParser.java b/objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/fauxpas/FauxPasReportParser.java
@@ -25,8 +25,8 @@
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
+import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.rule.RuleKey;
 
 import java.io.File;
@@ -91,14 +91,19 @@ private void recordIssue(final JSONObject diagnosticJson) {
             }
 
             InputFile inputFile = context.fileSystem().inputFile(fp);
-            NewIssueLocation dil = new DefaultIssueLocation()
-                .on(inputFile)
-                .at(inputFile.selectLine(lineNum))
-                .message(info);
-            context.newIssue()
-                .forRule(RuleKey.of(FauxPasRulesDefinition.REPOSITORY_KEY, (String) diagnosticJson.get("ruleShortName")))
-                .at(dil)
-                .save();
+            NewIssue issue = context.newIssue();
+
+            NewIssueLocation issueLocation = issue.newLocation()
+                    .message(info)
+                    .on(inputFile)
+                    .at(inputFile.selectLine(lineNum));
+
+            issue
+                    .forRule(RuleKey.of(FauxPasRulesDefinition.REPOSITORY_KEY, (String) diagnosticJson.get("ruleShortName")))
+                    .at(issueLocation);
+
+            issue.save();
+
         }
     }
 
diff --git a/objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/oclint/OCLintParser.java b/objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/oclint/OCLintParser.java
@@ -22,8 +22,8 @@
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
+import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.rule.RuleKey;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -95,13 +95,17 @@ private void collectFileViolations(String filePath, NodeList nodeList) {
             Node node = nodeList.item(i);
             if (node.getNodeType() == Node.ELEMENT_NODE) {
                 Element element = (Element) node;
-                NewIssueLocation dil = new DefaultIssueLocation()
+
+                NewIssue issue = context.newIssue();
+
+                NewIssueLocation issueLocation = issue.newLocation()
                     .on(inputFile)
                     .at(inputFile.selectLine(Integer.valueOf(element.getAttribute(LINE))))
                     .message(element.getTextContent());
-                context.newIssue()
+
+                issue
                     .forRule(RuleKey.of(OCLintRulesDefinition.REPOSITORY_KEY, element.getAttribute(RULE)))
-                    .at(dil)
+                    .at(issueLocation)
                     .save();
             }
         }
diff --git a/swiftlang/src/main/java/com/backelite/sonarqube/swift/SwiftSquidSensor.java b/swiftlang/src/main/java/com/backelite/sonarqube/swift/SwiftSquidSensor.java
@@ -33,7 +33,6 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.scan.filesystem.PathResolver;
@@ -97,14 +96,17 @@ private void saveIssues(InputFile inputFile, SourceFile squidFile) {
                 RuleKey ruleKey = checks.ruleKey((SquidCheck<SwiftGrammar>) message.getCheck());
                 NewIssue issue = context.newIssue()
                     .forRule(ruleKey);
-                NewIssueLocation dil = new DefaultIssueLocation()
-                    .on(inputFile)
-                    .at(inputFile.selectLine(message.getLine()))
-                    .message(message.getText(Locale.ENGLISH));
+
+                NewIssueLocation dil = issue.newLocation()
+                        .message(message.getText(Locale.ENGLISH))
+                        .on(inputFile)
+                        .at(inputFile.selectLine(message.getLine()));
                 issue.at(dil);
+
                 if (message.getCost() != null) {
                     issue.gap(message.getCost());
                 }
+
                 issue.save();
             }
         }
diff --git a/swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintReportParser.java b/swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintReportParser.java
@@ -22,8 +22,8 @@
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
+import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.rule.RuleKey;
 
 import java.io.*;
@@ -68,13 +68,15 @@ private void recordIssue(final String line) {
             }
 
             InputFile inputFile = context.fileSystem().inputFile(fp);
-            NewIssueLocation dil = new DefaultIssueLocation()
-                .on(inputFile)
-                .at(inputFile.selectLine(lineNum))
-                .message(message);
-            context.newIssue()
-                .forRule(RuleKey.of(SwiftLintRulesDefinition.REPOSITORY_KEY, ruleId))
-                .at(dil)
+            NewIssue issue = context.newIssue();
+
+            NewIssueLocation issueLocation = issue.newLocation()
+                    .message(message)
+                    .on(inputFile)
+                    .at(inputFile.selectLine(lineNum));
+
+            issue.forRule(RuleKey.of(SwiftLintRulesDefinition.REPOSITORY_KEY, ruleId))
+                .at(issueLocation)
                 .save();
         }
     }
diff --git a/swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/tailor/TailorReportParser.java b/swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/tailor/TailorReportParser.java
@@ -22,8 +22,8 @@
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
+import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
 import org.sonar.api.rule.RuleKey;
 
 import java.io.*;
@@ -73,13 +73,16 @@ private void recordIssue(final String line) {
             }
 
             InputFile inputFile = context.fileSystem().inputFile(fp);
-            NewIssueLocation dil = new DefaultIssueLocation()
-                .on(inputFile)
-                .at(inputFile.selectLine(lineNum))
-                .message(message);
-            context.newIssue()
+            NewIssue issue = context.newIssue();
+
+            NewIssueLocation issueLocation = issue.newLocation()
+                    .message(message)
+                    .on(inputFile)
+                    .at(inputFile.selectLine(lineNum));
+
+            issue
                 .forRule(RuleKey.of(TailorRulesDefinition.REPOSITORY_KEY, ruleId))
-                .at(dil)
+                .at(issueLocation)
                 .save();
         }
     }
