SONAR-5945 Rename resource -> component in batch protocol

3 files changed, 17 insertions, 18 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ResourcesPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
index 1bdbf2579a7..976259bfcd5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ResourcesPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
@@ -25,35 +25,34 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.batch.index.BatchResource;
 import org.sonar.batch.index.ResourceCache;
-import org.sonar.batch.protocol.output.resource.ReportResource;
-import org.sonar.batch.protocol.output.resource.ReportResource.Type;
-import org.sonar.batch.protocol.output.resource.ReportResources;
+import org.sonar.batch.protocol.output.resource.ReportComponent;
+import org.sonar.batch.protocol.output.resource.ReportComponents;
 
 import java.io.File;
 import java.io.IOException;
 
-public class ResourcesPublisher implements ReportPublisher {
+public class ComponentsPublisher implements ReportPublisher {
 
   private final ResourceCache resourceCache;
   private final ProjectReactor reactor;
 
-  public ResourcesPublisher(ProjectReactor reactor, ResourceCache resourceCache) {
+  public ComponentsPublisher(ProjectReactor reactor, ResourceCache resourceCache) {
     this.reactor = reactor;
     this.resourceCache = resourceCache;
   }
 
   @Override
   public void export(File reportDir) throws IOException {
-    ReportResources resources = new ReportResources();
+    ReportComponents components = new ReportComponents();
     BatchResource rootProject = resourceCache.get(reactor.getRoot().getKeyWithBranch());
-    resources.setRoot(buildResourceForReport(rootProject));
+    components.setRoot(buildResourceForReport(rootProject));
     File resourcesFile = new File(reportDir, "resources.json");
-    FileUtils.write(resourcesFile, resources.toJson());
+    FileUtils.write(resourcesFile, components.toJson());
   }
 
-  private ReportResource buildResourceForReport(BatchResource batchResource) {
+  private ReportComponent buildResourceForReport(BatchResource batchResource) {
     Resource r = batchResource.resource();
-    ReportResource result = new ReportResource()
+    ReportComponent result = new ReportComponent()
       .setBatchId(batchResource.batchId())
       .setSnapshotId(batchResource.snapshotId())
       .setId(r.getId())
@@ -66,15 +65,15 @@ public class ResourcesPublisher implements ReportPublisher {
     return result;
   }
 
-  private Type getType(Resource r) {
+  private ReportComponent.Type getType(Resource r) {
     if (ResourceUtils.isFile(r)) {
-      return ReportResource.Type.FIL;
+      return ReportComponent.Type.FIL;
     } else if (ResourceUtils.isDirectory(r)) {
-      return ReportResource.Type.DIR;
+      return ReportComponent.Type.DIR;
     } else if (ResourceUtils.isModuleProject(r)) {
-      return ReportResource.Type.MOD;
+      return ReportComponent.Type.MOD;
     } else if (ResourceUtils.isRootProject(r)) {
-      return ReportResource.Type.PRJ;
+      return ReportComponent.Type.PRJ;
     }
     throw new IllegalArgumentException("Unknow resource type: " + r);
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/IssuesPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/IssuesPublisher.java
index f95845c654d..290820d11bc 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/IssuesPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/IssuesPublisher.java
@@ -68,7 +68,7 @@ public class IssuesPublisher implements ReportPublisher {
     BatchResource batchResource = resourceCache.get(issue.componentKey());
     return new ReportIssue()
       .setKey(issue.key())
-      .setResourceBatchId(batchResource != null ? batchResource.batchId() : null)
+      .setComponentBatchId(batchResource != null ? batchResource.batchId() : null)
       .setNew(issue.isNew())
       .setLine(issue.line())
       .setMessage(issue.message())
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
index 5898b9452b7..c022067683e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
@@ -62,7 +62,7 @@ import org.sonar.batch.qualitygate.GenerateQualityGateEvents;
 import org.sonar.batch.qualitygate.QualityGateProvider;
 import org.sonar.batch.qualitygate.QualityGateVerifier;
 import org.sonar.batch.report.IssuesPublisher;
-import org.sonar.batch.report.ResourcesPublisher;
+import org.sonar.batch.report.ComponentsPublisher;
 import org.sonar.batch.rule.ActiveRulesProvider;
 import org.sonar.batch.rule.ModuleQProfiles;
 import org.sonar.batch.rule.QProfileDecorator;
@@ -120,7 +120,7 @@ public class ModuleScanContainer extends ComponentContainer {
       PhaseExecutor.class,
       PhasesTimeProfiler.class,
       PhaseExecutor.getPhaseClasses(),
-      ResourcesPublisher.class,
+      ComponentsPublisher.class,
       IssuesPublisher.class,
       moduleDefinition.getContainerExtensions(),