Fix quality flaws in class SearchIndex

diff --git a/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java b/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
index bff6f252c90fcc3f1df127d87965d32ee414d9d7..8970de4a862a3a698277868faf7c8b8b7c4eb403 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/SearchIndex.java
@@ -45,6 +45,7 @@ import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.picocontainer.Startable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.core.profiling.Profiling;
@@ -57,7 +58,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class SearchIndex {
+public class SearchIndex implements Startable {
 
   private static final String BULK_EXECUTE_FAILED = "Execution of bulk operation failed";
   private static final String BULK_INTERRUPTED = "Interrupted during bulk operation";
@@ -82,10 +83,12 @@ public class SearchIndex {
     this.profiling = profiling;
   }
 
+  @Override
   public void start() {
     this.client = searchNode.client();
   }
 
+  @Override
   public void stop() {
     if(client != null) {
       client.close();
@@ -266,8 +269,8 @@ public class SearchIndex {
 
   public void bulkDelete(String index, String type, String[] ids) {
     BulkRequestBuilder builder = new BulkRequestBuilder(client);
-    for (int i=0; i<ids.length; i++) {
-      builder.add(client.prepareDelete(index, type, ids[i]));
+    for (String id : ids) {
+      builder.add(client.prepareDelete(index, type, id));
     }
     StopWatch watch = createWatch();
     try {

diff --git a/sonar-server/src/test/java/org/sonar/server/search/SearchIndexTest.java b/sonar-server/src/test/java/org/sonar/server/search/SearchIndexTest.java
index 439635a93583e01fa5ed35d8225a65051bd444bb..f06fd9c01621a685696c45c68820dabf0a79199d 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/search/SearchIndexTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/search/SearchIndexTest.java
@@ -103,7 +103,7 @@ public class SearchIndexTest {
     searchIndex.addMappingFromClasspath("unchecked", "unchecked", resourcePath);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test(expected = RuntimeException.class)
   public void should_fail_to_load_malformed_mapping() {
     String resourcePath = "/org/sonar/server/search/SearchIndexTest/malformed.json";