Fix quality flaws

author: Simon Brandhof <simon.brandhof@sonarsource.com> 2015-02-04 11:46:12 +0100
committer: Simon Brandhof <simon.brandhof@sonarsource.com> 2015-02-04 11:46:12 +0100
commit: e2d3a2b2591bb2f43f13a42328cbf23f6c935e84 (patch)
tree: 8969e706d9165a7c7d949d79f19daae0b507787a
parent: bd22041edd9715212bc1c5a92eed393af80de95f (diff)
download: sonarqube-e2d3a2b2591bb2f43f13a42328cbf23f6c935e84.tar.gz
sonarqube-e2d3a2b2591bb2f43f13a42328cbf23f6c935e84.zip
16 files changed, 414 insertions, 396 deletions
diff --git a/microbenchmark-template/src/main/java/org/sonar/microbenchmark/SerializationBenchmark.java b/microbenchmark-template/src/main/java/org/sonar/microbenchmark/SerializationBenchmark.java
index 9d12e64998d..8c599a82c87 100644
--- a/microbenchmark-template/src/main/java/org/sonar/microbenchmark/SerializationBenchmark.java
+++ b/microbenchmark-template/src/main/java/org/sonar/microbenchmark/SerializationBenchmark.java
@@ -1,21 +1,21 @@
 /*
- * markdown-benchmark
- * Copyright (C) 2009 ${owner}
- * dev@sonar.codehaus.org
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
  *
- * This program is free software; you can redistribute it and/or
+ * SonarQube is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * SonarQube is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 package org.sonar.microbenchmark;
 
@@ -33,7 +33,7 @@ import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchOutput;
+import org.sonar.batch.protocol.output.BatchReport;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
@@ -85,7 +85,7 @@ public class SerializationBenchmark {
     // An alternative can be http://stackoverflow.com/a/21870564/229031
     try (OutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile, false))) {
       for (int i = 0; i < 10000; i++) {
-        BatchOutput.ReportIssue.Builder issueBuilder = BatchOutput.ReportIssue.newBuilder();
+        BatchReport.Issue.Builder issueBuilder = BatchReport.Issue.newBuilder();
         issueBuilder.setUuid("UUID_" + i);
         issueBuilder.setSeverity(Constants.Severity.BLOCKER);
         issueBuilder.setMsg("this is the message of issue " + i);
diff --git a/microbenchmark-template/src/test/java/org/sonar/microbenchmark/SerializationBenchmarkTest.java b/microbenchmark-template/src/test/java/org/sonar/microbenchmark/SerializationBenchmarkTest.java
index 05be832fd8c..33f42438932 100644
--- a/microbenchmark-template/src/test/java/org/sonar/microbenchmark/SerializationBenchmarkTest.java
+++ b/microbenchmark-template/src/test/java/org/sonar/microbenchmark/SerializationBenchmarkTest.java
@@ -1,3 +1,22 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 package org.sonar.microbenchmark;
 
 import org.apache.commons.io.FileUtils;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java
index 74e4788460b..a7709c8e139 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java
@@ -20,7 +20,8 @@
 
 package org.sonar.server.computation;
 
-import org.sonar.batch.protocol.output.BatchOutput;
+import com.google.common.base.Preconditions;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.server.computation.step.ParseReportStep;
@@ -33,7 +34,7 @@ public class ComputationContext {
   /**
    * Cache of analysis date as it can be accessed several times
    */
-  private BatchOutput.ReportMetadata reportMetadata = null;
+  private BatchReport.Metadata reportMetadata = null;
 
   public ComputationContext(AnalysisReportDto reportDto, ComponentDto project) {
     this.reportDto = reportDto;
@@ -48,14 +49,12 @@ public class ComputationContext {
     return project;
   }
 
-  public BatchOutput.ReportMetadata getReportMetadata() {
-    if (reportMetadata == null) {
-      throw new IllegalStateException("Report metadata is available after execution of " + ParseReportStep.class);
-    }
+  public BatchReport.Metadata getReportMetadata() {
+    Preconditions.checkState(reportMetadata != null, "Report metadata is available after execution of " + ParseReportStep.class);
     return reportMetadata;
   }
 
-  public void setReportMetadata(BatchOutput.ReportMetadata m) {
+  public void setReportMetadata(BatchReport.Metadata m) {
     this.reportMetadata = m;
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueComputation.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueComputation.java
index 4a75701e905..c6288054115 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueComputation.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueComputation.java
@@ -25,7 +25,7 @@ import org.sonar.api.issue.internal.FieldDiffs;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.Duration;
 import org.sonar.api.utils.KeyValueFormat;
-import org.sonar.batch.protocol.output.BatchOutput;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.rule.RuleDto;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.util.cache.DiskCache;
@@ -47,9 +47,9 @@ public class IssueComputation {
     this.diskIssuesAppender = issueCache.newAppender();
   }
 
-  public void processComponentIssues(ComputationContext context, String componentUuid, Iterable<BatchOutput.ReportIssue> issues) {
+  public void processComponentIssues(ComputationContext context, String componentUuid, Iterable<BatchReport.Issue> issues) {
     linesCache.init(componentUuid);
-    for (BatchOutput.ReportIssue reportIssue : issues) {
+    for (BatchReport.Issue reportIssue : issues) {
       DefaultIssue issue = toDefaultIssue(context, componentUuid, reportIssue);
       if (issue.isNew()) {
         guessAuthor(issue);
@@ -62,7 +62,7 @@ public class IssueComputation {
     linesCache.clear();
   }
 
-  private DefaultIssue toDefaultIssue(ComputationContext context, String componentUuid, BatchOutput.ReportIssue issue) {
+  private DefaultIssue toDefaultIssue(ComputationContext context, String componentUuid, BatchReport.Issue issue) {
     DefaultIssue target = new DefaultIssue();
     target.setKey(issue.getUuid());
     target.setComponentUuid(componentUuid);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
index c98359fa9f2..6df408a0aac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
@@ -25,8 +25,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.TempFolder;
-import org.sonar.batch.protocol.output.BatchOutput;
 import org.sonar.batch.protocol.output.BatchOutputReader;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
@@ -64,7 +64,7 @@ public class ParseReportStep implements ComputationStep {
 
       // prepare parsing of report
       BatchOutputReader reader = new BatchOutputReader(reportDir);
-      BatchOutput.ReportMetadata reportMetadata = reader.readMetadata();
+      BatchReport.Metadata reportMetadata = reader.readMetadata();
       context.setReportMetadata(reportMetadata);
 
       // and parse!
@@ -91,7 +91,7 @@ public class ParseReportStep implements ComputationStep {
   }
 
   private void recursivelyProcessComponent(BatchOutputReader reportReader, ComputationContext context, int componentRef) {
-    BatchOutput.ReportComponent component = reportReader.readComponent(componentRef);
+    BatchReport.Component component = reportReader.readComponent(componentRef);
     issueComputation.processComponentIssues(context, component.getUuid(), reportReader.readComponentIssues(componentRef));
 
     for (Integer childRef : component.getChildRefsList()) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java
index 0e9b3dc8106..93a8ee42290 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java
@@ -30,7 +30,7 @@ import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.internal.DefaultIssue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchOutput;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.rule.RuleDto;
 import org.sonar.server.computation.ComputationContext;
 
@@ -54,7 +54,7 @@ public class IssueComputationTest {
   SourceLinesCache lineCache = mock(SourceLinesCache.class);
   ScmAccountCache scmAccountCache = mock(ScmAccountCache.class);
   RuleDto rule = new RuleDto().setRepositoryKey(RULE_KEY.repository()).setRuleKey(RULE_KEY.rule());
-  BatchOutput.ReportIssue.Builder inputIssue = BatchOutput.ReportIssue.newBuilder()
+  BatchReport.Issue.Builder inputIssue = BatchReport.Issue.newBuilder()
     .setUuid("ISSUE_A")
     .setRuleRepository(RULE_KEY.repository())
     .setRuleKey(RULE_KEY.rule())
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
index 54fbcf1fb9f..4808564f182 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
@@ -25,8 +25,8 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.ZipUtils;
 import org.sonar.api.utils.internal.DefaultTempFolder;
 import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchOutput;
 import org.sonar.batch.protocol.output.BatchOutputWriter;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
@@ -65,9 +65,9 @@ public class ParseReportStepTest {
     step.execute(context);
 
     // verify that all components are processed (currently only for issues)
-    verify(issueComputation).processComponentIssues(context, "PROJECT_UUID", Collections.<BatchOutput.ReportIssue>emptyList());
-    verify(issueComputation).processComponentIssues(context, "FILE1_UUID", Collections.<BatchOutput.ReportIssue>emptyList());
-    verify(issueComputation).processComponentIssues(context, "FILE2_UUID", Collections.<BatchOutput.ReportIssue>emptyList());
+    verify(issueComputation).processComponentIssues(context, "PROJECT_UUID", Collections.<BatchReport.Issue>emptyList());
+    verify(issueComputation).processComponentIssues(context, "FILE1_UUID", Collections.<BatchReport.Issue>emptyList());
+    verify(issueComputation).processComponentIssues(context, "FILE2_UUID", Collections.<BatchReport.Issue>emptyList());
     verify(issueComputation).afterReportProcessing();
     assertThat(context.getReportMetadata().getRootComponentRef()).isEqualTo(1);
   }
@@ -76,24 +76,24 @@ public class ParseReportStepTest {
     File dir = temp.newFolder();
     // project and 2 files
     BatchOutputWriter writer = new BatchOutputWriter(dir);
-    writer.writeMetadata(BatchOutput.ReportMetadata.newBuilder()
+    writer.writeMetadata(BatchReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .setProjectKey("PROJECT_KEY")
       .setAnalysisDate(150000000L)
       .build());
-    writer.writeComponent(BatchOutput.ReportComponent.newBuilder()
+    writer.writeComponent(BatchReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setUuid("PROJECT_UUID")
       .addChildRefs(2)
       .addChildRefs(3)
       .build());
-    writer.writeComponent(BatchOutput.ReportComponent.newBuilder()
+    writer.writeComponent(BatchReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.FILE)
       .setUuid("FILE1_UUID")
       .build());
-    writer.writeComponent(BatchOutput.ReportComponent.newBuilder()
+    writer.writeComponent(BatchReport.Component.newBuilder()
       .setRef(3)
       .setType(Constants.ComponentType.FILE)
       .setUuid("FILE2_UUID")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java
index cf784e682d0..9f0f7b982d7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java
@@ -27,7 +27,7 @@ import org.sonar.api.issue.internal.DefaultIssue;
 import org.sonar.api.notifications.Notification;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchOutput;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.computation.issue.IssueCache;
 import org.sonar.server.computation.issue.RuleCache;
@@ -65,7 +65,7 @@ public class SendIssueNotificationsStepTest {
     issueCache.newAppender().append(new DefaultIssue().setSeverity(Severity.BLOCKER)).close();
 
     when(context.getProject().uuid()).thenReturn("PROJECT_UUID");
-    when(context.getReportMetadata()).thenReturn(BatchOutput.ReportMetadata.newBuilder().build());
+    when(context.getReportMetadata()).thenReturn(BatchReport.Metadata.newBuilder().build());
     when(notifService.hasProjectSubscribersForTypes("PROJECT_UUID", SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(true);
 
     SendIssueNotificationsStep step = new SendIssueNotificationsStep(issueCache, ruleCache, notifService);
diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchOutput.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java
index d42f92e5a82..23c3a57d828 100644
--- a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchOutput.java
+++ b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java
@@ -1,15 +1,15 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: batch_output.proto
+// source: batch_report.proto
 
 package org.sonar.batch.protocol.output;
 
-public final class BatchOutput {
-  private BatchOutput() {}
+public final class BatchReport {
+  private BatchReport() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public interface ReportMetadataOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ReportMetadata)
+  public interface MetadataOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:Metadata)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -45,25 +45,25 @@ public final class BatchOutput {
     int getRootComponentRef();
   }
   /**
-   * Protobuf type {@code ReportMetadata}
+   * Protobuf type {@code Metadata}
    */
-  public static final class ReportMetadata extends
+  public static final class Metadata extends
       com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:ReportMetadata)
-      ReportMetadataOrBuilder {
-    // Use ReportMetadata.newBuilder() to construct.
-    private ReportMetadata(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      // @@protoc_insertion_point(message_implements:Metadata)
+      MetadataOrBuilder {
+    // Use Metadata.newBuilder() to construct.
+    private Metadata(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private ReportMetadata(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Metadata(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final ReportMetadata defaultInstance;
-    public static ReportMetadata getDefaultInstance() {
+    private static final Metadata defaultInstance;
+    public static Metadata getDefaultInstance() {
       return defaultInstance;
     }
 
-    public ReportMetadata getDefaultInstanceForType() {
+    public Metadata getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -73,7 +73,7 @@ public final class BatchOutput {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private ReportMetadata(
+    private Metadata(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -126,28 +126,28 @@ public final class BatchOutput {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportMetadata_descriptor;
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportMetadata_fieldAccessorTable
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.class, org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.Builder.class);
+              org.sonar.batch.protocol.output.BatchReport.Metadata.class, org.sonar.batch.protocol.output.BatchReport.Metadata.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ReportMetadata> PARSER =
-        new com.google.protobuf.AbstractParser<ReportMetadata>() {
-      public ReportMetadata parsePartialFrom(
+    public static com.google.protobuf.Parser<Metadata> PARSER =
+        new com.google.protobuf.AbstractParser<Metadata>() {
+      public Metadata parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReportMetadata(input, extensionRegistry);
+        return new Metadata(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ReportMetadata> getParserForType() {
+    public com.google.protobuf.Parser<Metadata> getParserForType() {
       return PARSER;
     }
 
@@ -284,53 +284,53 @@ public final class BatchOutput {
       return super.writeReplace();
     }
 
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(byte[] data)
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseDelimitedFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseDelimitedFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -339,7 +339,7 @@ public final class BatchOutput {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchOutput.ReportMetadata prototype) {
+    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Metadata prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -351,25 +351,25 @@ public final class BatchOutput {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportMetadata}
+     * Protobuf type {@code Metadata}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ReportMetadata)
-        org.sonar.batch.protocol.output.BatchOutput.ReportMetadataOrBuilder {
+        // @@protoc_insertion_point(builder_implements:Metadata)
+        org.sonar.batch.protocol.output.BatchReport.MetadataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportMetadata_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportMetadata_fieldAccessorTable
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.class, org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.Builder.class);
+                org.sonar.batch.protocol.output.BatchReport.Metadata.class, org.sonar.batch.protocol.output.BatchReport.Metadata.Builder.class);
       }
 
-      // Construct using org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.newBuilder()
+      // Construct using org.sonar.batch.protocol.output.BatchReport.Metadata.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -404,23 +404,23 @@ public final class BatchOutput {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportMetadata_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_descriptor;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportMetadata getDefaultInstanceForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.getDefaultInstance();
+      public org.sonar.batch.protocol.output.BatchReport.Metadata getDefaultInstanceForType() {
+        return org.sonar.batch.protocol.output.BatchReport.Metadata.getDefaultInstance();
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportMetadata build() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportMetadata result = buildPartial();
+      public org.sonar.batch.protocol.output.BatchReport.Metadata build() {
+        org.sonar.batch.protocol.output.BatchReport.Metadata result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportMetadata buildPartial() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportMetadata result = new org.sonar.batch.protocol.output.BatchOutput.ReportMetadata(this);
+      public org.sonar.batch.protocol.output.BatchReport.Metadata buildPartial() {
+        org.sonar.batch.protocol.output.BatchReport.Metadata result = new org.sonar.batch.protocol.output.BatchReport.Metadata(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -441,16 +441,16 @@ public final class BatchOutput {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.sonar.batch.protocol.output.BatchOutput.ReportMetadata) {
-          return mergeFrom((org.sonar.batch.protocol.output.BatchOutput.ReportMetadata)other);
+        if (other instanceof org.sonar.batch.protocol.output.BatchReport.Metadata) {
+          return mergeFrom((org.sonar.batch.protocol.output.BatchReport.Metadata)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchOutput.ReportMetadata other) {
-        if (other == org.sonar.batch.protocol.output.BatchOutput.ReportMetadata.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.Metadata other) {
+        if (other == org.sonar.batch.protocol.output.BatchReport.Metadata.getDefaultInstance()) return this;
         if (other.hasAnalysisDate()) {
           setAnalysisDate(other.getAnalysisDate());
         }
@@ -474,11 +474,11 @@ public final class BatchOutput {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.sonar.batch.protocol.output.BatchOutput.ReportMetadata parsedMessage = null;
+        org.sonar.batch.protocol.output.BatchReport.Metadata parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.sonar.batch.protocol.output.BatchOutput.ReportMetadata) e.getUnfinishedMessage();
+          parsedMessage = (org.sonar.batch.protocol.output.BatchReport.Metadata) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -629,19 +629,19 @@ public final class BatchOutput {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportMetadata)
+      // @@protoc_insertion_point(builder_scope:Metadata)
     }
 
     static {
-      defaultInstance = new ReportMetadata(true);
+      defaultInstance = new Metadata(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportMetadata)
+    // @@protoc_insertion_point(class_scope:Metadata)
   }
 
-  public interface ReportComponentOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ReportComponent)
+  public interface ComponentOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:Component)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -758,25 +758,25 @@ public final class BatchOutput {
         getUuidBytes();
   }
   /**
-   * Protobuf type {@code ReportComponent}
+   * Protobuf type {@code Component}
    */
-  public static final class ReportComponent extends
+  public static final class Component extends
       com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:ReportComponent)
-      ReportComponentOrBuilder {
-    // Use ReportComponent.newBuilder() to construct.
-    private ReportComponent(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      // @@protoc_insertion_point(message_implements:Component)
+      ComponentOrBuilder {
+    // Use Component.newBuilder() to construct.
+    private Component(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private ReportComponent(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Component(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final ReportComponent defaultInstance;
-    public static ReportComponent getDefaultInstance() {
+    private static final Component defaultInstance;
+    public static Component getDefaultInstance() {
       return defaultInstance;
     }
 
-    public ReportComponent getDefaultInstanceForType() {
+    public Component getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -786,7 +786,7 @@ public final class BatchOutput {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private ReportComponent(
+    private Component(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -897,28 +897,28 @@ public final class BatchOutput {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportComponent_descriptor;
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportComponent_fieldAccessorTable
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.sonar.batch.protocol.output.BatchOutput.ReportComponent.class, org.sonar.batch.protocol.output.BatchOutput.ReportComponent.Builder.class);
+              org.sonar.batch.protocol.output.BatchReport.Component.class, org.sonar.batch.protocol.output.BatchReport.Component.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ReportComponent> PARSER =
-        new com.google.protobuf.AbstractParser<ReportComponent>() {
-      public ReportComponent parsePartialFrom(
+    public static com.google.protobuf.Parser<Component> PARSER =
+        new com.google.protobuf.AbstractParser<Component>() {
+      public Component parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReportComponent(input, extensionRegistry);
+        return new Component(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ReportComponent> getParserForType() {
+    public com.google.protobuf.Parser<Component> getParserForType() {
       return PARSER;
     }
 
@@ -1294,53 +1294,53 @@ public final class BatchOutput {
       return super.writeReplace();
     }
 
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(byte[] data)
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseDelimitedFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseDelimitedFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportComponent parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1349,7 +1349,7 @@ public final class BatchOutput {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchOutput.ReportComponent prototype) {
+    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Component prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1361,25 +1361,25 @@ public final class BatchOutput {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportComponent}
+     * Protobuf type {@code Component}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ReportComponent)
-        org.sonar.batch.protocol.output.BatchOutput.ReportComponentOrBuilder {
+        // @@protoc_insertion_point(builder_implements:Component)
+        org.sonar.batch.protocol.output.BatchReport.ComponentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportComponent_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportComponent_fieldAccessorTable
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonar.batch.protocol.output.BatchOutput.ReportComponent.class, org.sonar.batch.protocol.output.BatchOutput.ReportComponent.Builder.class);
+                org.sonar.batch.protocol.output.BatchReport.Component.class, org.sonar.batch.protocol.output.BatchReport.Component.Builder.class);
       }
 
-      // Construct using org.sonar.batch.protocol.output.BatchOutput.ReportComponent.newBuilder()
+      // Construct using org.sonar.batch.protocol.output.BatchReport.Component.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1426,23 +1426,23 @@ public final class BatchOutput {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportComponent_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_descriptor;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportComponent getDefaultInstanceForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.ReportComponent.getDefaultInstance();
+      public org.sonar.batch.protocol.output.BatchReport.Component getDefaultInstanceForType() {
+        return org.sonar.batch.protocol.output.BatchReport.Component.getDefaultInstance();
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportComponent build() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportComponent result = buildPartial();
+      public org.sonar.batch.protocol.output.BatchReport.Component build() {
+        org.sonar.batch.protocol.output.BatchReport.Component result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportComponent buildPartial() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportComponent result = new org.sonar.batch.protocol.output.BatchOutput.ReportComponent(this);
+      public org.sonar.batch.protocol.output.BatchReport.Component buildPartial() {
+        org.sonar.batch.protocol.output.BatchReport.Component result = new org.sonar.batch.protocol.output.BatchReport.Component(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1488,16 +1488,16 @@ public final class BatchOutput {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.sonar.batch.protocol.output.BatchOutput.ReportComponent) {
-          return mergeFrom((org.sonar.batch.protocol.output.BatchOutput.ReportComponent)other);
+        if (other instanceof org.sonar.batch.protocol.output.BatchReport.Component) {
+          return mergeFrom((org.sonar.batch.protocol.output.BatchReport.Component)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchOutput.ReportComponent other) {
-        if (other == org.sonar.batch.protocol.output.BatchOutput.ReportComponent.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.Component other) {
+        if (other == org.sonar.batch.protocol.output.BatchReport.Component.getDefaultInstance()) return this;
         if (other.hasRef()) {
           setRef(other.getRef());
         }
@@ -1552,11 +1552,11 @@ public final class BatchOutput {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.sonar.batch.protocol.output.BatchOutput.ReportComponent parsedMessage = null;
+        org.sonar.batch.protocol.output.BatchReport.Component parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.sonar.batch.protocol.output.BatchOutput.ReportComponent) e.getUnfinishedMessage();
+          parsedMessage = (org.sonar.batch.protocol.output.BatchReport.Component) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2084,19 +2084,19 @@ public final class BatchOutput {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportComponent)
+      // @@protoc_insertion_point(builder_scope:Component)
     }
 
     static {
-      defaultInstance = new ReportComponent(true);
+      defaultInstance = new Component(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportComponent)
+    // @@protoc_insertion_point(class_scope:Component)
   }
 
-  public interface ReportIssueOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ReportIssue)
+  public interface IssueOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:Issue)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -2417,25 +2417,25 @@ public final class BatchOutput {
     boolean getMustSendNotification();
   }
   /**
-   * Protobuf type {@code ReportIssue}
+   * Protobuf type {@code Issue}
    */
-  public static final class ReportIssue extends
+  public static final class Issue extends
       com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:ReportIssue)
-      ReportIssueOrBuilder {
-    // Use ReportIssue.newBuilder() to construct.
-    private ReportIssue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      // @@protoc_insertion_point(message_implements:Issue)
+      IssueOrBuilder {
+    // Use Issue.newBuilder() to construct.
+    private Issue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private ReportIssue(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Issue(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final ReportIssue defaultInstance;
-    public static ReportIssue getDefaultInstance() {
+    private static final Issue defaultInstance;
+    public static Issue getDefaultInstance() {
       return defaultInstance;
     }
 
-    public ReportIssue getDefaultInstanceForType() {
+    public Issue getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -2445,7 +2445,7 @@ public final class BatchOutput {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private ReportIssue(
+    private Issue(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2638,28 +2638,28 @@ public final class BatchOutput {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssue_descriptor;
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssue_fieldAccessorTable
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.sonar.batch.protocol.output.BatchOutput.ReportIssue.class, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder.class);
+              org.sonar.batch.protocol.output.BatchReport.Issue.class, org.sonar.batch.protocol.output.BatchReport.Issue.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ReportIssue> PARSER =
-        new com.google.protobuf.AbstractParser<ReportIssue>() {
-      public ReportIssue parsePartialFrom(
+    public static com.google.protobuf.Parser<Issue> PARSER =
+        new com.google.protobuf.AbstractParser<Issue>() {
+      public Issue parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReportIssue(input, extensionRegistry);
+        return new Issue(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ReportIssue> getParserForType() {
+    public com.google.protobuf.Parser<Issue> getParserForType() {
       return PARSER;
     }
 
@@ -3676,53 +3676,53 @@ public final class BatchOutput {
       return super.writeReplace();
     }
 
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(byte[] data)
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseDelimitedFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseDelimitedFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssue parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3731,7 +3731,7 @@ public final class BatchOutput {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchOutput.ReportIssue prototype) {
+    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Issue prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3743,25 +3743,25 @@ public final class BatchOutput {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportIssue}
+     * Protobuf type {@code Issue}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ReportIssue)
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder {
+        // @@protoc_insertion_point(builder_implements:Issue)
+        org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssue_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssue_fieldAccessorTable
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonar.batch.protocol.output.BatchOutput.ReportIssue.class, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder.class);
+                org.sonar.batch.protocol.output.BatchReport.Issue.class, org.sonar.batch.protocol.output.BatchReport.Issue.Builder.class);
       }
 
-      // Construct using org.sonar.batch.protocol.output.BatchOutput.ReportIssue.newBuilder()
+      // Construct using org.sonar.batch.protocol.output.BatchReport.Issue.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3842,23 +3842,23 @@ public final class BatchOutput {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssue_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_descriptor;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue getDefaultInstanceForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.ReportIssue.getDefaultInstance();
+      public org.sonar.batch.protocol.output.BatchReport.Issue getDefaultInstanceForType() {
+        return org.sonar.batch.protocol.output.BatchReport.Issue.getDefaultInstance();
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue build() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssue result = buildPartial();
+      public org.sonar.batch.protocol.output.BatchReport.Issue build() {
+        org.sonar.batch.protocol.output.BatchReport.Issue result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue buildPartial() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssue result = new org.sonar.batch.protocol.output.BatchOutput.ReportIssue(this);
+      public org.sonar.batch.protocol.output.BatchReport.Issue buildPartial() {
+        org.sonar.batch.protocol.output.BatchReport.Issue result = new org.sonar.batch.protocol.output.BatchReport.Issue(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3972,16 +3972,16 @@ public final class BatchOutput {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.sonar.batch.protocol.output.BatchOutput.ReportIssue) {
-          return mergeFrom((org.sonar.batch.protocol.output.BatchOutput.ReportIssue)other);
+        if (other instanceof org.sonar.batch.protocol.output.BatchReport.Issue) {
+          return mergeFrom((org.sonar.batch.protocol.output.BatchReport.Issue)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchOutput.ReportIssue other) {
-        if (other == org.sonar.batch.protocol.output.BatchOutput.ReportIssue.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.Issue other) {
+        if (other == org.sonar.batch.protocol.output.BatchReport.Issue.getDefaultInstance()) return this;
         if (other.hasRuleRepository()) {
           bitField0_ |= 0x00000001;
           ruleRepository_ = other.ruleRepository_;
@@ -4105,11 +4105,11 @@ public final class BatchOutput {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssue parsedMessage = null;
+        org.sonar.batch.protocol.output.BatchReport.Issue parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.sonar.batch.protocol.output.BatchOutput.ReportIssue) e.getUnfinishedMessage();
+          parsedMessage = (org.sonar.batch.protocol.output.BatchReport.Issue) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -5604,19 +5604,19 @@ public final class BatchOutput {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportIssue)
+      // @@protoc_insertion_point(builder_scope:Issue)
     }
 
     static {
-      defaultInstance = new ReportIssue(true);
+      defaultInstance = new Issue(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportIssue)
+    // @@protoc_insertion_point(class_scope:Issue)
   }
 
-  public interface ReportIssuesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ReportIssues)
+  public interface IssuesOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:Issues)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -5629,49 +5629,49 @@ public final class BatchOutput {
     int getComponentRef();
 
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue> 
+    java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> 
         getListList();
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    org.sonar.batch.protocol.output.BatchOutput.ReportIssue getList(int index);
+    org.sonar.batch.protocol.output.BatchReport.Issue getList(int index);
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
     int getListCount();
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    java.util.List<? extends org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder> 
+    java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder> 
         getListOrBuilderList();
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder getListOrBuilder(
+    org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder getListOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ReportIssues}
+   * Protobuf type {@code Issues}
    */
-  public static final class ReportIssues extends
+  public static final class Issues extends
       com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:ReportIssues)
-      ReportIssuesOrBuilder {
-    // Use ReportIssues.newBuilder() to construct.
-    private ReportIssues(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      // @@protoc_insertion_point(message_implements:Issues)
+      IssuesOrBuilder {
+    // Use Issues.newBuilder() to construct.
+    private Issues(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private ReportIssues(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Issues(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final ReportIssues defaultInstance;
-    public static ReportIssues getDefaultInstance() {
+    private static final Issues defaultInstance;
+    public static Issues getDefaultInstance() {
       return defaultInstance;
     }
 
-    public ReportIssues getDefaultInstanceForType() {
+    public Issues getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -5681,7 +5681,7 @@ public final class BatchOutput {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private ReportIssues(
+    private Issues(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5711,10 +5711,10 @@ public final class BatchOutput {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                list_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchOutput.ReportIssue>();
+                list_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchReport.Issue>();
                 mutable_bitField0_ |= 0x00000002;
               }
-              list_.add(input.readMessage(org.sonar.batch.protocol.output.BatchOutput.ReportIssue.PARSER, extensionRegistry));
+              list_.add(input.readMessage(org.sonar.batch.protocol.output.BatchReport.Issue.PARSER, extensionRegistry));
               break;
             }
           }
@@ -5734,28 +5734,28 @@ public final class BatchOutput {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssues_descriptor;
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssues_fieldAccessorTable
+      return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.sonar.batch.protocol.output.BatchOutput.ReportIssues.class, org.sonar.batch.protocol.output.BatchOutput.ReportIssues.Builder.class);
+              org.sonar.batch.protocol.output.BatchReport.Issues.class, org.sonar.batch.protocol.output.BatchReport.Issues.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ReportIssues> PARSER =
-        new com.google.protobuf.AbstractParser<ReportIssues>() {
-      public ReportIssues parsePartialFrom(
+    public static com.google.protobuf.Parser<Issues> PARSER =
+        new com.google.protobuf.AbstractParser<Issues>() {
+      public Issues parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReportIssues(input, extensionRegistry);
+        return new Issues(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ReportIssues> getParserForType() {
+    public com.google.protobuf.Parser<Issues> getParserForType() {
       return PARSER;
     }
 
@@ -5776,36 +5776,36 @@ public final class BatchOutput {
     }
 
     public static final int LIST_FIELD_NUMBER = 2;
-    private java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue> list_;
+    private java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> list_;
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    public java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue> getListList() {
+    public java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> getListList() {
       return list_;
     }
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    public java.util.List<? extends org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder> 
+    public java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder> 
         getListOrBuilderList() {
       return list_;
     }
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
     public int getListCount() {
       return list_.size();
     }
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    public org.sonar.batch.protocol.output.BatchOutput.ReportIssue getList(int index) {
+    public org.sonar.batch.protocol.output.BatchReport.Issue getList(int index) {
       return list_.get(index);
     }
     /**
-     * <code>repeated .ReportIssue list = 2;</code>
+     * <code>repeated .Issue list = 2;</code>
      */
-    public org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder getListOrBuilder(
+    public org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder getListOrBuilder(
         int index) {
       return list_.get(index);
     }
@@ -5862,53 +5862,53 @@ public final class BatchOutput {
       return super.writeReplace();
     }
 
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(byte[] data)
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseDelimitedFrom(java.io.InputStream input)
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseDelimitedFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonar.batch.protocol.output.BatchOutput.ReportIssues parseFrom(
+    public static org.sonar.batch.protocol.output.BatchReport.Issues parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5917,7 +5917,7 @@ public final class BatchOutput {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchOutput.ReportIssues prototype) {
+    public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Issues prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -5929,25 +5929,25 @@ public final class BatchOutput {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportIssues}
+     * Protobuf type {@code Issues}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ReportIssues)
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssuesOrBuilder {
+        // @@protoc_insertion_point(builder_implements:Issues)
+        org.sonar.batch.protocol.output.BatchReport.IssuesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssues_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssues_fieldAccessorTable
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonar.batch.protocol.output.BatchOutput.ReportIssues.class, org.sonar.batch.protocol.output.BatchOutput.ReportIssues.Builder.class);
+                org.sonar.batch.protocol.output.BatchReport.Issues.class, org.sonar.batch.protocol.output.BatchReport.Issues.Builder.class);
       }
 
-      // Construct using org.sonar.batch.protocol.output.BatchOutput.ReportIssues.newBuilder()
+      // Construct using org.sonar.batch.protocol.output.BatchReport.Issues.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5985,23 +5985,23 @@ public final class BatchOutput {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.internal_static_ReportIssues_descriptor;
+        return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_descriptor;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssues getDefaultInstanceForType() {
-        return org.sonar.batch.protocol.output.BatchOutput.ReportIssues.getDefaultInstance();
+      public org.sonar.batch.protocol.output.BatchReport.Issues getDefaultInstanceForType() {
+        return org.sonar.batch.protocol.output.BatchReport.Issues.getDefaultInstance();
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssues build() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssues result = buildPartial();
+      public org.sonar.batch.protocol.output.BatchReport.Issues build() {
+        org.sonar.batch.protocol.output.BatchReport.Issues result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssues buildPartial() {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssues result = new org.sonar.batch.protocol.output.BatchOutput.ReportIssues(this);
+      public org.sonar.batch.protocol.output.BatchReport.Issues buildPartial() {
+        org.sonar.batch.protocol.output.BatchReport.Issues result = new org.sonar.batch.protocol.output.BatchReport.Issues(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6023,16 +6023,16 @@ public final class BatchOutput {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.sonar.batch.protocol.output.BatchOutput.ReportIssues) {
-          return mergeFrom((org.sonar.batch.protocol.output.BatchOutput.ReportIssues)other);
+        if (other instanceof org.sonar.batch.protocol.output.BatchReport.Issues) {
+          return mergeFrom((org.sonar.batch.protocol.output.BatchReport.Issues)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchOutput.ReportIssues other) {
-        if (other == org.sonar.batch.protocol.output.BatchOutput.ReportIssues.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.Issues other) {
+        if (other == org.sonar.batch.protocol.output.BatchReport.Issues.getDefaultInstance()) return this;
         if (other.hasComponentRef()) {
           setComponentRef(other.getComponentRef());
         }
@@ -6074,11 +6074,11 @@ public final class BatchOutput {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.sonar.batch.protocol.output.BatchOutput.ReportIssues parsedMessage = null;
+        org.sonar.batch.protocol.output.BatchReport.Issues parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.sonar.batch.protocol.output.BatchOutput.ReportIssues) e.getUnfinishedMessage();
+          parsedMessage = (org.sonar.batch.protocol.output.BatchReport.Issues) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -6121,22 +6121,22 @@ public final class BatchOutput {
         return this;
       }
 
-      private java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue> list_ =
+      private java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> list_ =
         java.util.Collections.emptyList();
       private void ensureListIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          list_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchOutput.ReportIssue>(list_);
+          list_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchReport.Issue>(list_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.sonar.batch.protocol.output.BatchOutput.ReportIssue, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder, org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder> listBuilder_;
+          org.sonar.batch.protocol.output.BatchReport.Issue, org.sonar.batch.protocol.output.BatchReport.Issue.Builder, org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder> listBuilder_;
 
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue> getListList() {
+      public java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> getListList() {
         if (listBuilder_ == null) {
           return java.util.Collections.unmodifiableList(list_);
         } else {
@@ -6144,7 +6144,7 @@ public final class BatchOutput {
         }
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public int getListCount() {
         if (listBuilder_ == null) {
@@ -6154,9 +6154,9 @@ public final class BatchOutput {
         }
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue getList(int index) {
+      public org.sonar.batch.protocol.output.BatchReport.Issue getList(int index) {
         if (listBuilder_ == null) {
           return list_.get(index);
         } else {
@@ -6164,10 +6164,10 @@ public final class BatchOutput {
         }
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder setList(
-          int index, org.sonar.batch.protocol.output.BatchOutput.ReportIssue value) {
+          int index, org.sonar.batch.protocol.output.BatchReport.Issue value) {
         if (listBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6181,10 +6181,10 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder setList(
-          int index, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder builderForValue) {
+          int index, org.sonar.batch.protocol.output.BatchReport.Issue.Builder builderForValue) {
         if (listBuilder_ == null) {
           ensureListIsMutable();
           list_.set(index, builderForValue.build());
@@ -6195,9 +6195,9 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public Builder addList(org.sonar.batch.protocol.output.BatchOutput.ReportIssue value) {
+      public Builder addList(org.sonar.batch.protocol.output.BatchReport.Issue value) {
         if (listBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6211,10 +6211,10 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder addList(
-          int index, org.sonar.batch.protocol.output.BatchOutput.ReportIssue value) {
+          int index, org.sonar.batch.protocol.output.BatchReport.Issue value) {
         if (listBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6228,10 +6228,10 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder addList(
-          org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder builderForValue) {
+          org.sonar.batch.protocol.output.BatchReport.Issue.Builder builderForValue) {
         if (listBuilder_ == null) {
           ensureListIsMutable();
           list_.add(builderForValue.build());
@@ -6242,10 +6242,10 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder addList(
-          int index, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder builderForValue) {
+          int index, org.sonar.batch.protocol.output.BatchReport.Issue.Builder builderForValue) {
         if (listBuilder_ == null) {
           ensureListIsMutable();
           list_.add(index, builderForValue.build());
@@ -6256,10 +6256,10 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder addAllList(
-          java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchOutput.ReportIssue> values) {
+          java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.Issue> values) {
         if (listBuilder_ == null) {
           ensureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -6271,7 +6271,7 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder clearList() {
         if (listBuilder_ == null) {
@@ -6284,7 +6284,7 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
       public Builder removeList(int index) {
         if (listBuilder_ == null) {
@@ -6297,16 +6297,16 @@ public final class BatchOutput {
         return this;
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder getListBuilder(
+      public org.sonar.batch.protocol.output.BatchReport.Issue.Builder getListBuilder(
           int index) {
         return getListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder getListOrBuilder(
+      public org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder getListOrBuilder(
           int index) {
         if (listBuilder_ == null) {
           return list_.get(index);  } else {
@@ -6314,9 +6314,9 @@ public final class BatchOutput {
         }
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public java.util.List<? extends org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder> 
+      public java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder> 
            getListOrBuilderList() {
         if (listBuilder_ != null) {
           return listBuilder_.getMessageOrBuilderList();
@@ -6325,33 +6325,33 @@ public final class BatchOutput {
         }
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder addListBuilder() {
+      public org.sonar.batch.protocol.output.BatchReport.Issue.Builder addListBuilder() {
         return getListFieldBuilder().addBuilder(
-            org.sonar.batch.protocol.output.BatchOutput.ReportIssue.getDefaultInstance());
+            org.sonar.batch.protocol.output.BatchReport.Issue.getDefaultInstance());
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder addListBuilder(
+      public org.sonar.batch.protocol.output.BatchReport.Issue.Builder addListBuilder(
           int index) {
         return getListFieldBuilder().addBuilder(
-            index, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.getDefaultInstance());
+            index, org.sonar.batch.protocol.output.BatchReport.Issue.getDefaultInstance());
       }
       /**
-       * <code>repeated .ReportIssue list = 2;</code>
+       * <code>repeated .Issue list = 2;</code>
        */
-      public java.util.List<org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder> 
+      public java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue.Builder> 
            getListBuilderList() {
         return getListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.sonar.batch.protocol.output.BatchOutput.ReportIssue, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder, org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder> 
+          org.sonar.batch.protocol.output.BatchReport.Issue, org.sonar.batch.protocol.output.BatchReport.Issue.Builder, org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder> 
           getListFieldBuilder() {
         if (listBuilder_ == null) {
           listBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.sonar.batch.protocol.output.BatchOutput.ReportIssue, org.sonar.batch.protocol.output.BatchOutput.ReportIssue.Builder, org.sonar.batch.protocol.output.BatchOutput.ReportIssueOrBuilder>(
+              org.sonar.batch.protocol.output.BatchReport.Issue, org.sonar.batch.protocol.output.BatchReport.Issue.Builder, org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder>(
                   list_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -6361,37 +6361,37 @@ public final class BatchOutput {
         return listBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportIssues)
+      // @@protoc_insertion_point(builder_scope:Issues)
     }
 
     static {
-      defaultInstance = new ReportIssues(true);
+      defaultInstance = new Issues(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportIssues)
+    // @@protoc_insertion_point(class_scope:Issues)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportMetadata_descriptor;
+    internal_static_Metadata_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportMetadata_fieldAccessorTable;
+      internal_static_Metadata_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportComponent_descriptor;
+    internal_static_Component_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportComponent_fieldAccessorTable;
+      internal_static_Component_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportIssue_descriptor;
+    internal_static_Issue_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportIssue_fieldAccessorTable;
+      internal_static_Issue_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportIssues_descriptor;
+    internal_static_Issues_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportIssues_fieldAccessorTable;
+      internal_static_Issues_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -6401,30 +6401,30 @@ public final class BatchOutput {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022batch_output.proto\032\017constants.proto\"X\n" +
-      "\016ReportMetadata\022\025\n\ranalysis_date\030\001 \001(\003\022\023" +
-      "\n\013project_key\030\002 \001(\t\022\032\n\022root_component_re" +
-      "f\030\003 \001(\005\"\262\001\n\017ReportComponent\022\013\n\003ref\030\001 \001(\005" +
-      "\022\014\n\004path\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022\034\n\004type\030\004 \001" +
-      "(\0162\016.ComponentType\022\017\n\007is_test\030\005 \001(\010\022\020\n\010l" +
-      "anguage\030\006 \001(\t\022\022\n\nchild_refs\030\007 \003(\005\022\023\n\013sna" +
-      "pshot_id\030\010 \001(\005\022\014\n\004uuid\030\t \001(\t\"\240\004\n\013ReportI" +
-      "ssue\022\027\n\017rule_repository\030\001 \001(\t\022\020\n\010rule_ke" +
-      "y\030\002 \001(\t\022\014\n\004line\030\003 \001(\005\022\013\n\003msg\030\004 \001(\t\022\033\n\010se",
-      "verity\030\005 \001(\0162\t.Severity\022\014\n\004tags\030\006 \003(\t\022\025\n" +
-      "\reffort_to_fix\030\007 \001(\001\022\016\n\006is_new\030\010 \001(\010\022\014\n\004" +
-      "uuid\030\t \001(\t\022\027\n\017debt_in_minutes\030\n \001(\003\022\022\n\nr" +
-      "esolution\030\013 \001(\t\022\016\n\006status\030\014 \001(\t\022\020\n\010check" +
-      "sum\030\r \001(\t\022\027\n\017manual_severity\030\016 \001(\010\022\020\n\010re" +
-      "porter\030\017 \001(\t\022\020\n\010assignee\030\020 \001(\t\022\027\n\017action" +
-      "_plan_key\030\021 \001(\t\022\022\n\nattributes\030\022 \001(\t\022\024\n\014a" +
-      "uthor_login\030\023 \001(\t\022\025\n\rcreation_date\030\024 \001(\003" +
-      "\022\022\n\nclose_date\030\025 \001(\003\022\023\n\013update_date\030\026 \001(" +
-      "\003\022\023\n\013selected_at\030\027 \001(\003\022\023\n\013diff_fields\030\030 ",
-      "\001(\t\022\022\n\nis_changed\030\031 \001(\010\022\036\n\026must_send_not" +
-      "ification\030\032 \001(\010\"A\n\014ReportIssues\022\025\n\rcompo" +
-      "nent_ref\030\001 \001(\005\022\032\n\004list\030\002 \003(\0132\014.ReportIss" +
-      "ueB#\n\037org.sonar.batch.protocol.outputH\001"
+      "\n\022batch_report.proto\032\017constants.proto\"R\n" +
+      "\010Metadata\022\025\n\ranalysis_date\030\001 \001(\003\022\023\n\013proj" +
+      "ect_key\030\002 \001(\t\022\032\n\022root_component_ref\030\003 \001(" +
+      "\005\"\254\001\n\tComponent\022\013\n\003ref\030\001 \001(\005\022\014\n\004path\030\002 \001" +
+      "(\t\022\014\n\004name\030\003 \001(\t\022\034\n\004type\030\004 \001(\0162\016.Compone" +
+      "ntType\022\017\n\007is_test\030\005 \001(\010\022\020\n\010language\030\006 \001(" +
+      "\t\022\022\n\nchild_refs\030\007 \003(\005\022\023\n\013snapshot_id\030\010 \001" +
+      "(\005\022\014\n\004uuid\030\t \001(\t\"\232\004\n\005Issue\022\027\n\017rule_repos" +
+      "itory\030\001 \001(\t\022\020\n\010rule_key\030\002 \001(\t\022\014\n\004line\030\003 " +
+      "\001(\005\022\013\n\003msg\030\004 \001(\t\022\033\n\010severity\030\005 \001(\0162\t.Sev",
+      "erity\022\014\n\004tags\030\006 \003(\t\022\025\n\reffort_to_fix\030\007 \001" +
+      "(\001\022\016\n\006is_new\030\010 \001(\010\022\014\n\004uuid\030\t \001(\t\022\027\n\017debt" +
+      "_in_minutes\030\n \001(\003\022\022\n\nresolution\030\013 \001(\t\022\016\n" +
+      "\006status\030\014 \001(\t\022\020\n\010checksum\030\r \001(\t\022\027\n\017manua" +
+      "l_severity\030\016 \001(\010\022\020\n\010reporter\030\017 \001(\t\022\020\n\010as" +
+      "signee\030\020 \001(\t\022\027\n\017action_plan_key\030\021 \001(\t\022\022\n" +
+      "\nattributes\030\022 \001(\t\022\024\n\014author_login\030\023 \001(\t\022" +
+      "\025\n\rcreation_date\030\024 \001(\003\022\022\n\nclose_date\030\025 \001" +
+      "(\003\022\023\n\013update_date\030\026 \001(\003\022\023\n\013selected_at\030\027" +
+      " \001(\003\022\023\n\013diff_fields\030\030 \001(\t\022\022\n\nis_changed\030",
+      "\031 \001(\010\022\036\n\026must_send_notification\030\032 \001(\010\"5\n" +
+      "\006Issues\022\025\n\rcomponent_ref\030\001 \001(\005\022\024\n\004list\030\002" +
+      " \003(\0132\006.IssueB#\n\037org.sonar.batch.protocol" +
+      ".outputH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -6439,29 +6439,29 @@ public final class BatchOutput {
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.sonar.batch.protocol.Constants.getDescriptor(),
         }, assigner);
-    internal_static_ReportMetadata_descriptor =
+    internal_static_Metadata_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_ReportMetadata_fieldAccessorTable = new
+    internal_static_Metadata_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_ReportMetadata_descriptor,
+        internal_static_Metadata_descriptor,
         new java.lang.String[] { "AnalysisDate", "ProjectKey", "RootComponentRef", });
-    internal_static_ReportComponent_descriptor =
+    internal_static_Component_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_ReportComponent_fieldAccessorTable = new
+    internal_static_Component_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_ReportComponent_descriptor,
+        internal_static_Component_descriptor,
         new java.lang.String[] { "Ref", "Path", "Name", "Type", "IsTest", "Language", "ChildRefs", "SnapshotId", "Uuid", });
-    internal_static_ReportIssue_descriptor =
+    internal_static_Issue_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_ReportIssue_fieldAccessorTable = new
+    internal_static_Issue_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_ReportIssue_descriptor,
+        internal_static_Issue_descriptor,
         new java.lang.String[] { "RuleRepository", "RuleKey", "Line", "Msg", "Severity", "Tags", "EffortToFix", "IsNew", "Uuid", "DebtInMinutes", "Resolution", "Status", "Checksum", "ManualSeverity", "Reporter", "Assignee", "ActionPlanKey", "Attributes", "AuthorLogin", "CreationDate", "CloseDate", "UpdateDate", "SelectedAt", "DiffFields", "IsChanged", "MustSendNotification", });
-    internal_static_ReportIssues_descriptor =
+    internal_static_Issues_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_ReportIssues_fieldAccessorTable = new
+    internal_static_Issues_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_ReportIssues_descriptor,
+        internal_static_Issues_descriptor,
         new java.lang.String[] { "ComponentRef", "List", });
     org.sonar.batch.protocol.Constants.getDescriptor();
   }
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputReader.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputReader.java
index fe5799b19ba..28c50041c82 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputReader.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputReader.java
@@ -33,28 +33,28 @@ public class BatchOutputReader {
     this.fileStructure = new FileStructure(dir);
   }
 
-  public BatchOutput.ReportMetadata readMetadata() {
+  public BatchReport.Metadata readMetadata() {
     File file = fileStructure.metadataFile();
     if (!file.exists() || !file.isFile()) {
       throw new IllegalStateException("Metadata file is missing in analysis report: " + file);
     }
-    return ProtobufUtil.readFile(file, BatchOutput.ReportMetadata.PARSER);
+    return ProtobufUtil.readFile(file, BatchReport.Metadata.PARSER);
   }
 
   @CheckForNull
-  public BatchOutput.ReportComponent readComponent(int componentRef) {
+  public BatchReport.Component readComponent(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.COMPONENT, componentRef);
     if (file.exists() && file.isFile()) {
-      return ProtobufUtil.readFile(file, BatchOutput.ReportComponent.PARSER);
+      return ProtobufUtil.readFile(file, BatchReport.Component.PARSER);
     }
     return null;
   }
 
-  public Iterable<BatchOutput.ReportIssue> readComponentIssues(int componentRef) {
+  public Iterable<BatchReport.Issue> readComponentIssues(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.ISSUES, componentRef);
     if (file.exists() && file.isFile()) {
       // all the issues are loaded in memory
-      BatchOutput.ReportIssues issues = ProtobufUtil.readFile(file, BatchOutput.ReportIssues.PARSER);
+      BatchReport.Issues issues = ProtobufUtil.readFile(file, BatchReport.Issues.PARSER);
       return issues.getListList();
     }
     return Collections.emptyList();
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputWriter.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputWriter.java
index 746ff600109..2e12a297e1e 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputWriter.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchOutputWriter.java
@@ -46,17 +46,17 @@ public class BatchOutputWriter {
   /**
    * Metadata is mandatory
    */
-  public void writeMetadata(BatchOutput.ReportMetadata metadata) {
+  public void writeMetadata(BatchReport.Metadata metadata) {
     ProtobufUtil.writeToFile(metadata, fileStructure.metadataFile());
   }
 
-  public void writeComponent(BatchOutput.ReportComponent component) {
+  public void writeComponent(BatchReport.Component component) {
     File file = fileStructure.fileFor(FileStructure.Domain.COMPONENT, component.getRef());
     ProtobufUtil.writeToFile(component, file);
   }
 
-  public void writeComponentIssues(int componentRef, Iterable<BatchOutput.ReportIssue> issues) {
-    BatchOutput.ReportIssues.Builder issuesBuilder = BatchOutput.ReportIssues.newBuilder();
+  public void writeComponentIssues(int componentRef, Iterable<BatchReport.Issue> issues) {
+    BatchReport.Issues.Builder issuesBuilder = BatchReport.Issues.newBuilder();
     issuesBuilder.setComponentRef(componentRef);
     issuesBuilder.addAllList(issues);
     File file = fileStructure.fileFor(FileStructure.Domain.ISSUES, componentRef);
diff --git a/sonar-batch-protocol/src/main/protobuf/batch_output.proto b/sonar-batch-protocol/src/main/protobuf/batch_report.proto
index 4b26c98ab25..0499fc2b3ca 100644
--- a/sonar-batch-protocol/src/main/protobuf/batch_output.proto
+++ b/sonar-batch-protocol/src/main/protobuf/batch_report.proto
@@ -38,13 +38,13 @@ import "constants.proto";
 option java_package = "org.sonar.batch.protocol.output";
 option optimize_for = SPEED;
 
-message ReportMetadata {
+message Metadata {
   optional int64 analysis_date = 1;
   optional string project_key = 2;
   optional int32 root_component_ref = 3;
 }
 
-message ReportComponent {
+message Component {
   optional int32 ref = 1;
   optional string path = 2;
   optional string name = 3;
@@ -58,7 +58,7 @@ message ReportComponent {
   optional string uuid = 9;
 }
 
-message ReportIssue {
+message Issue {
     optional string rule_repository = 1;
     optional string rule_key = 2;
     optional int32 line = 3;
@@ -89,7 +89,7 @@ message ReportIssue {
     optional bool must_send_notification = 26;
 }
 
-message ReportIssues {
+message Issues {
     optional int32 component_ref = 1;
-    repeated ReportIssue list = 2;
+    repeated Issue list = 2;
 }
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputReaderTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputReaderTest.java
index 930e3e3a1c8..c9fc72df6c7 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputReaderTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputReaderTest.java
@@ -51,18 +51,18 @@ public class BatchOutputReaderTest {
   private void initFiles(File dir) {
     BatchOutputWriter writer = new BatchOutputWriter(dir);
 
-    BatchOutput.ReportMetadata.Builder metadata = BatchOutput.ReportMetadata.newBuilder()
+    BatchReport.Metadata.Builder metadata = BatchReport.Metadata.newBuilder()
       .setAnalysisDate(15000000L)
       .setProjectKey("PROJECT_A")
       .setRootComponentRef(1);
     writer.writeMetadata(metadata.build());
 
-    BatchOutput.ReportComponent.Builder component = BatchOutput.ReportComponent.newBuilder()
+    BatchReport.Component.Builder component = BatchReport.Component.newBuilder()
       .setRef(1)
       .setUuid("UUID_A");
     writer.writeComponent(component.build());
 
-    BatchOutput.ReportIssue issue = BatchOutput.ReportIssue.newBuilder()
+    BatchReport.Issue issue = BatchReport.Issue.newBuilder()
       .setUuid("ISSUE_A")
       .setLine(50)
       .build();
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputWriterTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputWriterTest.java
index 9261f1b1eaa..ed1d4362048 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputWriterTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchOutputWriterTest.java
@@ -50,13 +50,13 @@ public class BatchOutputWriterTest {
   public void write_metadata() throws Exception {
     File dir = temp.newFolder();
     BatchOutputWriter writer = new BatchOutputWriter(dir);
-    BatchOutput.ReportMetadata.Builder metadata = BatchOutput.ReportMetadata.newBuilder()
+    BatchReport.Metadata.Builder metadata = BatchReport.Metadata.newBuilder()
       .setAnalysisDate(15000000L)
       .setProjectKey("PROJECT_A")
       .setRootComponentRef(1);
     writer.writeMetadata(metadata.build());
 
-    BatchOutput.ReportMetadata read = ProtobufUtil.readFile(writer.getFileStructure().metadataFile(), BatchOutput.ReportMetadata.PARSER);
+    BatchReport.Metadata read = ProtobufUtil.readFile(writer.getFileStructure().metadataFile(), BatchReport.Metadata.PARSER);
     assertThat(read.getAnalysisDate()).isEqualTo(15000000L);
     assertThat(read.getProjectKey()).isEqualTo("PROJECT_A");
     assertThat(read.getRootComponentRef()).isEqualTo(1);
@@ -71,7 +71,7 @@ public class BatchOutputWriterTest {
     assertThat(writer.hasComponentData(FileStructure.Domain.COMPONENT, 1)).isFalse();
 
     // write data
-    BatchOutput.ReportComponent.Builder component = BatchOutput.ReportComponent.newBuilder()
+    BatchReport.Component.Builder component = BatchReport.Component.newBuilder()
       .setRef(1)
       .setLanguage("java")
       .setPath("src/Foo.java")
@@ -85,7 +85,7 @@ public class BatchOutputWriterTest {
     assertThat(writer.hasComponentData(FileStructure.Domain.COMPONENT, 1)).isTrue();
     File file = writer.getFileStructure().fileFor(FileStructure.Domain.COMPONENT, 1);
     assertThat(file).exists().isFile();
-    BatchOutput.ReportComponent read = ProtobufUtil.readFile(file, BatchOutput.ReportComponent.PARSER);
+    BatchReport.Component read = ProtobufUtil.readFile(file, BatchReport.Component.PARSER);
     assertThat(read.getRef()).isEqualTo(1);
     assertThat(read.getChildRefsList()).containsOnly(5, 42);
     assertThat(read.hasName()).isFalse();
@@ -102,7 +102,7 @@ public class BatchOutputWriterTest {
     assertThat(writer.hasComponentData(FileStructure.Domain.ISSUES, 1)).isFalse();
 
     // write data
-    BatchOutput.ReportIssue issue = BatchOutput.ReportIssue.newBuilder()
+    BatchReport.Issue issue = BatchReport.Issue.newBuilder()
       .setUuid("ISSUE_A")
       .setLine(50)
       .setMsg("the message")
@@ -113,7 +113,7 @@ public class BatchOutputWriterTest {
     assertThat(writer.hasComponentData(FileStructure.Domain.ISSUES, 1)).isTrue();
     File file = writer.getFileStructure().fileFor(FileStructure.Domain.ISSUES, 1);
     assertThat(file).exists().isFile();
-    BatchOutput.ReportIssues read = ProtobufUtil.readFile(file, BatchOutput.ReportIssues.PARSER);
+    BatchReport.Issues read = ProtobufUtil.readFile(file, BatchReport.Issues.PARSER);
     assertThat(read.getComponentRef()).isEqualTo(1);
     assertThat(read.getListCount()).isEqualTo(1);
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
index 797a479a2dc..3604685d66f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
@@ -27,8 +27,8 @@ import org.sonar.api.resources.ResourceUtils;
 import org.sonar.batch.index.BatchResource;
 import org.sonar.batch.index.ResourceCache;
 import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchOutput;
 import org.sonar.batch.protocol.output.BatchOutputWriter;
+import org.sonar.batch.protocol.output.BatchReport;
 
 import javax.annotation.CheckForNull;
 
@@ -48,7 +48,7 @@ public class ComponentsPublisher implements ReportPublisher {
   @Override
   public void publish(BatchOutputWriter writer) {
     BatchResource rootProject = resourceCache.get(reactor.getRoot().getKeyWithBranch());
-    BatchOutput.ReportMetadata metadata = BatchOutput.ReportMetadata.newBuilder()
+    BatchReport.Metadata metadata = BatchReport.Metadata.newBuilder()
       .setAnalysisDate(((Project) rootProject.resource()).getAnalysisDate().getTime())
       .setProjectKey(((Project) rootProject.resource()).key())
       .setRootComponentRef(rootProject.batchId())
@@ -59,7 +59,7 @@ public class ComponentsPublisher implements ReportPublisher {
 
   private void recursiveWriteComponent(BatchResource batchResource, BatchOutputWriter writer) {
     Resource r = batchResource.resource();
-    BatchOutput.ReportComponent.Builder builder = BatchOutput.ReportComponent.newBuilder();
+    BatchReport.Component.Builder builder = BatchReport.Component.newBuilder();
 
     // non-null fields
     builder.setRef(batchResource.batchId());
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 9f4a2857c3a..0e135f8c373 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
@@ -29,7 +29,7 @@ import org.sonar.batch.index.ResourceCache;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchOutputWriter;
-import org.sonar.batch.protocol.output.BatchOutput;
+import org.sonar.batch.protocol.output.BatchReport;
 
 import javax.annotation.Nullable;
 
@@ -49,17 +49,17 @@ public class IssuesPublisher implements ReportPublisher {
   public void publish(BatchOutputWriter writer) {
     for (BatchResource resource : resourceCache.all()) {
       Iterable<DefaultIssue> issues = issueCache.byComponent(resource.resource().getEffectiveKey());
-      writer.writeComponentIssues(resource.batchId(), Iterables.transform(issues, new Function<DefaultIssue, BatchOutput.ReportIssue>() {
+      writer.writeComponentIssues(resource.batchId(), Iterables.transform(issues, new Function<DefaultIssue, BatchReport.Issue>() {
         @Override
-        public BatchOutput.ReportIssue apply(DefaultIssue input) {
+        public BatchReport.Issue apply(DefaultIssue input) {
           return toReportIssue(input);
         }
       }));
     }
   }
 
-  private BatchOutput.ReportIssue toReportIssue(DefaultIssue issue) {
-    BatchOutput.ReportIssue.Builder builder = BatchOutput.ReportIssue.newBuilder();
+  private BatchReport.Issue toReportIssue(DefaultIssue issue) {
+    BatchReport.Issue.Builder builder = BatchReport.Issue.newBuilder();
 
     // non-null fields
     builder.setUuid(issue.key());
author	Simon Brandhof <simon.brandhof@sonarsource.com>	2015-02-04 11:46:12 +0100
committer	Simon Brandhof <simon.brandhof@sonarsource.com>	2015-02-04 11:46:12 +0100
commit	e2d3a2b2591bb2f43f13a42328cbf23f6c935e84 (patch)
tree	8969e706d9165a7c7d949d79f19daae0b507787a
parent	bd22041edd9715212bc1c5a92eed393af80de95f (diff)
download	sonarqube-e2d3a2b2591bb2f43f13a42328cbf23f6c935e84.tar.gz sonarqube-e2d3a2b2591bb2f43f13a42328cbf23f6c935e84.zip