SONAR-5945 Improve export of components in report and fix upload

3 files changed, 37 insertions, 2 deletions

diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/resource/ReportComponent.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/resource/ReportComponent.java
index ef24686d4b2..578cf92d73d 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/resource/ReportComponent.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/resource/ReportComponent.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.batch.protocol.output.resource;
 
+import javax.annotation.CheckForNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -28,7 +30,9 @@ public class ReportComponent {
     PRJ,
     MOD,
     DIR,
-    FIL
+    FIL,
+    VIEW,
+    SUBVIEW
   }
 
   private long batchId;
@@ -37,6 +41,9 @@ public class ReportComponent {
   private String path;
   private String name;
   private Type type;
+  // Only for files
+  private Boolean isTest;
+  private String languageKey;
 
   private Collection<ReportComponent> children = new ArrayList<ReportComponent>();
 
@@ -94,6 +101,28 @@ public class ReportComponent {
     return type;
   }
 
+  public ReportComponent setTest(Boolean isTest) {
+    this.isTest = isTest;
+    return this;
+  }
+
+  /**
+   * @return null when not a file
+   */
+  @CheckForNull
+  public Boolean isTest() {
+    return isTest;
+  }
+
+  public ReportComponent setLanguageKey(String languageKey) {
+    this.languageKey = languageKey;
+    return this;
+  }
+
+  public String languageKey() {
+    return languageKey;
+  }
+
   public ReportComponent addChild(ReportComponent child) {
     this.children.add(child);
     return this;
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/resource/ReportComponentsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/resource/ReportComponentsTest.java
index 085a0c0f65a..b3b989aa8f8 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/resource/ReportComponentsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/resource/ReportComponentsTest.java
@@ -64,7 +64,9 @@ public class ReportComponentsTest {
       .setName("Foo.java")
       .setSnapshotId(444)
       .setPath("Foo.java")
-      .setType(Type.FIL);
+      .setType(Type.FIL)
+      .setTest(true)
+      .setLanguageKey("java");
     dir.addChild(file);
     res.setRoot(root);
 
@@ -89,6 +91,8 @@ public class ReportComponentsTest {
     assertThat(root.path()).isNull();
     assertThat(root.type()).isEqualTo(Type.PRJ);
     assertThat(root.children()).hasSize(1);
+    assertThat(root.isTest()).isNull();
+    assertThat(root.languageKey()).isNull();
 
   }
 }
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/resource/ReportResourceTest/expected.json b/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/resource/ReportResourceTest/expected.json
index 4c642a06ba0..581bbc5ea23 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/resource/ReportResourceTest/expected.json
+++ b/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/resource/ReportResourceTest/expected.json
@@ -30,6 +30,8 @@
                 "path": "Foo.java",
                 "name": "Foo.java",
                 "type": "FIL",
+                "languageKey": "java",
+                "isTest": true,
                 "children": []
               }
             ]