Cosmetic refactoring of org.sonar.server.source.index

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineDoc.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineDoc.java
index a1147697f4e858761feee380a8eb68acd5567fc6..5fd358dfda4e75052e9ce478221ec5fa44d4258d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineDoc.java
@@ -90,8 +90,8 @@ public class SourceLineDoc extends BaseDoc {
     return getField(SourceLineIndexDefinition.FIELD_HIGHLIGHTING);
   }
 
-  public void setHighlighting(String fileUuid) {
-    setField(SourceLineIndexDefinition.FIELD_HIGHLIGHTING, fileUuid);
+  public void setHighlighting(String s) {
+    setField(SourceLineIndexDefinition.FIELD_HIGHLIGHTING, s);
   }
 
   public String source() {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java
index 4ed8d7abe8091e6f3629db4d768ebda0281347c3..12213981ee69905dd4c746ac555c14ffe4bdc9c1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java
@@ -58,8 +58,7 @@ public class SourceLineIndexer extends BaseIndexer {
     }
   }
 
-  @VisibleForTesting
-  long index(Iterator<SourceLineResultSetIterator.SourceFile> sourceFiles) {
+  public long index(Iterator<SourceLineResultSetIterator.SourceFile> sourceFiles) {
     final BulkIndexer bulk = new BulkIndexer(esClient, SourceLineIndexDefinition.INDEX);
     return doIndex(bulk, sourceFiles);
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java
index 718a4f96bc5c153619e7354852110d472665c54e..a3875fc69c5844ecb2a06b7169174c86a7d3869a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java
@@ -45,31 +45,31 @@ import java.util.List;
  * Scroll over table FILE_SOURCES and directly parse CSV field required to
  * populate the index sourcelines
  */
-class SourceLineResultSetIterator extends ResultSetIterator<SourceLineResultSetIterator.SourceFile> {
+public class SourceLineResultSetIterator extends ResultSetIterator<SourceLineResultSetIterator.SourceFile> {
 
-  static class SourceFile {
+  public static class SourceFile {
     private final String fileUuid;
     private final long updatedAt;
     private final List<SourceLineDoc> lines = Lists.newArrayList();
 
-    SourceFile(String fileUuid, long updatedAt) {
+    public SourceFile(String fileUuid, long updatedAt) {
       this.fileUuid = fileUuid;
       this.updatedAt = updatedAt;
     }
 
-    String getFileUuid() {
+    public String getFileUuid() {
       return fileUuid;
     }
 
-    long getUpdatedAt() {
+    public long getUpdatedAt() {
       return updatedAt;
     }
 
-    List<SourceLineDoc> getLines() {
+    public List<SourceLineDoc> getLines() {
       return lines;
     }
 
-    void addLine(SourceLineDoc line) {
+    public void addLine(SourceLineDoc line) {
       this.lines.add(line);
     }
   }