From 6c5aad9a2d48cd783993a3a31911e307bf6827f5 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Fri, 13 Apr 2018 15:59:23 +0200 Subject: [PATCH] SONAR-10543 Update test to v7.2 and remove descriptionUrl and ruleTitle from scanner --- .../main/java/org/sonar/xoo/XooPlugin.java | 3 +- .../rule/OneExternalIssuePerLineSensor.java | 2 -- .../api/batch/sensor/issue/ExternalIssue.java | 12 +------- .../batch/sensor/issue/NewExternalIssue.java | 10 ------- .../issue/internal/DefaultExternalIssue.java | 24 --------------- .../internal/SensorContextTesterTest.java | 2 -- .../internal/DefaultExternalIssueTest.java | 29 ------------------- .../org/sonar/scanner/issue/ModuleIssues.java | 3 +- .../sensor/noop/NoOpNewExternalIssue.java | 12 -------- .../sonar/scanner/issue/ModuleIssuesTest.java | 3 +- .../src/main/protobuf/scanner_report.proto | 5 +--- 11 files changed, 5 insertions(+), 100 deletions(-) diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/XooPlugin.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/XooPlugin.java index 3c036b1d566..47a8c3be351 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/XooPlugin.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/XooPlugin.java @@ -168,8 +168,7 @@ public class XooPlugin implements Plugin { if (context.getSonarQubeVersion().isGreaterThanOrEqual(Version.create(6, 6))) { context.addExtension(XooBuiltInQualityProfilesDefinition.class); } - // TODO change to v7.2 once version of SQ was updated - if (context.getSonarQubeVersion().isGreaterThanOrEqual(Version.create(7, 1))) { + if (context.getSonarQubeVersion().isGreaterThanOrEqual(Version.create(7, 2))) { context.addExtension(OneExternalIssuePerLineSensor.class); } } diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java index e47ddd4ef60..7b872e26ee8 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/OneExternalIssuePerLineSensor.java @@ -74,8 +74,6 @@ public class OneExternalIssuePerLineSensor implements Sensor { .on(file) .at(file.selectLine(line)) .message("This issue is generated on each line")) - .ruleTitle(NAME) - .descriptionUrl("http://oneexternalissueperline.xoo.net") .severity(Severity.valueOf(SEVERITY)) .remediationEffort(EFFORT) .type(type) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/ExternalIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/ExternalIssue.java index ec72c49de1a..b151a6582aa 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/ExternalIssue.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/ExternalIssue.java @@ -32,12 +32,6 @@ public interface ExternalIssue extends IIssue { Severity severity(); - /** - * Link to a page describing more details about the rule that triggered this issue. - */ - @CheckForNull - String descriptionUrl(); - /** * Effort to fix the issue, in minutes. */ @@ -48,9 +42,5 @@ public interface ExternalIssue extends IIssue { * Type of the issue. */ RuleType type(); - - /** - * Short description of the rule. Should not depend on the issue being raised. - */ - String ruleTitle(); + } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/NewExternalIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/NewExternalIssue.java index 8049c44e1dc..d2e55a999ee 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/NewExternalIssue.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/NewExternalIssue.java @@ -62,11 +62,6 @@ public interface NewExternalIssue { */ NewExternalIssue addLocation(NewIssueLocation secondaryLocation); - /** - * Add a URL pointing to more information about the rule triggering this issue. - */ - NewExternalIssue descriptionUrl(String url); - /** * Register a flow for this issue. A flow is an ordered list of issue locations that help to understand the issue. * It should be a path that backtracks the issue from its primary location to the start of the flow. @@ -79,11 +74,6 @@ public interface NewExternalIssue { */ NewIssueLocation newLocation(); - /** - * Add the description of the rule. Should not depend on the issue being raised. - */ - NewExternalIssue ruleTitle(String title); - /** * Save the issue. If rule key is unknown or rule not enabled in the current quality profile then a warning is logged but no exception * is thrown. diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssue.java index 6ffcb5055e8..a0bd77b53c7 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssue.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultExternalIssue.java @@ -34,9 +34,7 @@ import static java.util.Objects.requireNonNull; public class DefaultExternalIssue extends AbstractDefaultIssue implements ExternalIssue, NewExternalIssue { private Long effort; private Severity severity; - private String url; private RuleType type; - private String ruleTitle; public DefaultExternalIssue() { super(null); @@ -74,23 +72,11 @@ public class DefaultExternalIssue extends AbstractDefaultIssue flowLocations) { // no op @@ -82,12 +76,6 @@ public class NoOpNewExternalIssue implements NewExternalIssue { return new DefaultIssueLocation(); } - @Override - public NewExternalIssue ruleTitle(String title) { - // no op - return this; - } - @Override public void save() { // no op diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java index 844f6edcfab..6309720339d 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java @@ -155,8 +155,7 @@ public class ModuleIssuesTest { DefaultExternalIssue issue = new DefaultExternalIssue() .at(new DefaultIssueLocation().on(file).at(file.selectLine(3)).message("Foo")) .forRule(SQUID_RULE_KEY) - .severity(org.sonar.api.batch.rule.Severity.CRITICAL) - .ruleTitle("title"); + .severity(org.sonar.api.batch.rule.Severity.CRITICAL); moduleIssues.initAndAddExternalIssue(issue); diff --git a/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto index 13cf6dd56cc..922adca6f57 100644 --- a/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto +++ b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto @@ -197,10 +197,7 @@ message ExternalIssue { // Will be identical to the first location of the first flow TextRange text_range = 6; repeated Flow flow = 7; - // Can be empty as the field is optional - string descriptionUrl = 8; - IssueType type = 9; - string rule_title = 10; + IssueType type = 8; } enum IssueType { -- 2.39.5