SONAR-3755 fix component key and rename Issuable.IssueBuilder#create()

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
index d7d4458c7d44470d01b01765b3bf21b4ca717dc0..44055904fdf96ec3e896502f309932ddc6a0f0af 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
@@ -366,6 +366,7 @@ public class DefaultIndex extends SonarIndex {
       return;
     }
 
+    violation.setResource(bucket.getResource());
     deprecatedViolations.add(violation);
     addViolation(violation, bucket, force);
   }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java b/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java
index 2115546dcb62816c5ba438e53e6c25ff47e4fec8..bb9d98e5f2a9cc906a209f31b2287a4a4292cd9c 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java
@@ -43,7 +43,6 @@ public class IssueCache implements BatchComponent {
   }
 
   public IssueCache add(Issue issue) {
-    System.out.println("Cache issue = " + issue.key() + " on " + issue.componentKey());
     componentIssues.put(issue.componentKey(), issue);
     return this;
   }

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
index 435c0e036eb37f48ab772e8765a9fae9b923b5c3..917d19a58fc843bdc33c6bd30909454fa3773f58 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
@@ -88,7 +88,7 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   }
 
   @Override
-  public Issue create() {
+  public Issue done() {
     Preconditions.checkNotNull(componentKey, "Component key must be set");
     Preconditions.checkNotNull(ruleRepository, "Rule repository must be set");
     Preconditions.checkNotNull(ruleKey, "Rule key must be set");

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
index a113f2b810f186b00bf1892136b62280c27cb2f0..6e0bb3ea7ef82560d2c84f9ca1d32f5a394d6c73 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
@@ -32,17 +32,19 @@ public class DefaultIssueBuilderTest {
 
   @Test
   public void should_create_issue() throws Exception {
-    DefaultIssue issue = (DefaultIssue) new DefaultIssueBuilder(callback, "org.apache.struts")
+    String componentKey = "org.apache.struts:struts-core:Action.java";
+    DefaultIssue issue = (DefaultIssue) new DefaultIssueBuilder(callback, componentKey)
       .message("msg")
       .line(123)
       .cost(10000.0)
       .rule("squid", "NullDereference")
       .severity(Issue.SEVERITY_CRITICAL)
-      .create();
+      .done();
 
     assertThat(issue).isNotNull();
     assertThat(issue.key()).isNotEmpty();
     assertThat(issue.cost()).isEqualTo(10000.0);
+    assertThat(issue.componentKey()).isEqualTo(componentKey);
     assertThat(issue.message()).isEqualTo("msg");
     assertThat(issue.line()).isEqualTo(123);
     assertThat(issue.ruleRepositoryKey()).isEqualTo("squid");

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
index ceae0a99a0803585019e0c038e7b3cd228e04ee8..ecc8dc4cfebdca9cf11de5f819638bddb42e9c81 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
@@ -45,7 +45,7 @@ public interface Issuable extends Perspective {
 
     IssueBuilder manual(boolean b);
 
-    Issue create();
+    Issue done();
   }
 
   IssueBuilder newIssue();