Apply naming convention for repeated protobuf attributes

3 files changed, 6 insertions, 11 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/SourceDataFactory.java b/sonar-batch/src/main/java/org/sonar/batch/index/SourceDataFactory.java
index 0b7d9414f35..2aa0b854e01 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/SourceDataFactory.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/SourceDataFactory.java
@@ -43,12 +43,7 @@ import org.sonar.core.source.db.FileSourceDto;
 import org.sonar.server.source.db.FileSourceDb;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Consolidate different caches for the export of file sources to server.
@@ -362,7 +357,7 @@ public class SourceDataFactory implements BatchComponent {
     int currentLine = block.startLine();
     for (int i = 0; i < block.length(); i++) {
       if (currentLine <= to.getLinesCount()) {
-        to.getLinesBuilder(currentLine - 1).addDuplications(blockId);
+        to.getLinesBuilder(currentLine - 1).addDuplication(blockId);
         currentLine++;
       }
     }
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 06f5998bb7d..4f93d6fbcaf 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
@@ -89,7 +89,7 @@ public class ComponentsPublisher implements ReportPublisher {
       builder.setLanguage(lang);
     }
     for (BatchResource child : batchResource.children()) {
-      builder.addChildRefs(child.batchId());
+      builder.addChildRef(child.batchId());
     }
     if (isRealProjectOrModule(r)) {
       ProjectDefinition def = getProjectDefinition(reactor, r.getKey());
@@ -128,7 +128,7 @@ public class ComponentsPublisher implements ReportPublisher {
     if (StringUtils.isNotBlank(link)) {
       linkBuilder.setType(linkType);
       linkBuilder.setHref(link);
-      componentBuilder.addLinks(linkBuilder.build());
+      componentBuilder.addLink(linkBuilder.build());
       linkBuilder.clear();
     }
   }
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 0cefc7d25db..540c3fb723f 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
@@ -30,8 +30,8 @@ import org.sonar.batch.index.BatchResource;
 import org.sonar.batch.index.ResourceCache;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.batch.protocol.output.BatchReportWriter;
 
 import javax.annotation.Nullable;
 
@@ -114,7 +114,7 @@ public class IssuesPublisher implements ReportPublisher {
     builder.setRuleRepository(issue.ruleKey().repository());
     builder.setRuleKey(issue.ruleKey().rule());
     builder.setAttributes(KeyValueFormat.format(issue.attributes()));
-    builder.addAllTags(issue.tags());
+    builder.addAllTag(issue.tags());
     builder.setMustSendNotification(issue.mustSendNotifications());
     builder.setIsChanged(issue.isChanged());