SONAR-5237 - Fixed Load order in ServerComponents

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleConstants.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleConstants.java
index 636a6dcd67c475b2310c4afa185ab8983679abd4..a732f7bb9904185629259501bf8f3a953a66283f 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleConstants.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleConstants.java
@@ -21,6 +21,6 @@ package org.sonar.core.rule;
 
 public interface RuleConstants {
 
-  public static final String INDEX_NAME = "rules";
-  public static final String ES_TYPE = "rule";
+  public static final String INDEX_NAME = "rules2";
+  public static final String ES_TYPE = "rule2";
 }

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index e22bb3e9ec71b24b83b4055e6e8601a115b6fa60..68cabc0e67638158a2254b5f2de5e5556c2099a0 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -261,7 +261,6 @@ class ServerComponents {
     components.addAll(CorePropertyDefinitions.all());
     components.addAll(DatabaseMigrations.CLASSES);
     components.addAll(DaoUtils.getDaoClasses());
-    components.addAll(IndexUtils.getIndexClasses());
     return components;
   }
 
@@ -301,7 +300,7 @@ class ServerComponents {
    * when its schema is up-to-date.
    */
   Collection level3Components() {
-    return Lists.newArrayList(
+    List components = Lists.newArrayList(
       PersistentSettings.class,
       DefaultDatabaseConnector.class,
       ThreadLocalDatabaseSessionFactory.class,
@@ -312,6 +311,8 @@ class ServerComponents {
       UriReader.class,
       ServerIdGenerator.class
     );
+    components.addAll(IndexUtils.getIndexClasses());
+    return components;
   }
 
 

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
index 53e53f619266b24e8fc2d966c2156b5af6ad5524..c4cc7b457f510c82a203fe066aa40f76ce78b1aa 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
@@ -97,32 +97,36 @@ public class RuleIndex extends BaseIndex<RuleKey> {
   protected XContentBuilder getMapping() {
     try {
       return jsonBuilder().startObject()
-        .startObject("issue")
-          .startObject("properties")
-            .startObject("component.path")
-              .field("type", "string")
-              .field("index_analyzer", "path_analyzer")
-              .field("search_analyzer", "keyword")
-            .endObject()
-          .startObject("rule.name")
-            .field("type", "string")
-            .field("analyzer", "keyword")
-          .endObject()
-          .startObject("root.id")
-            .field("type", "multi_field")
-            .startObject("fields")
-              .startObject("str")
-                .field("type", "string")
-                .field("index","analyzed")
-                .field("analyzer", "default")
-              .endObject()
-              .startObject("num")
-                .field("type", "long")
-                .field("index","analyzed")
-              .endObject()
-          .endObject()
-        .endObject()
-      .endObject().endObject();
+          .startObject(this.getType()).endObject()
+        .endObject();
+
+//      return jsonBuilder().startObject()
+//        .startObject("issue")
+//          .startObject("properties")
+//            .startObject("component.path")
+//              .field("type", "string")
+//              .field("index_analyzer", "path_analyzer")
+//              .field("search_analyzer", "keyword")
+//            .endObject()
+//          .startObject("rule.name")
+//            .field("type", "string")
+//            .field("analyzer", "keyword")
+//          .endObject()
+//          .startObject("root.id")
+//            .field("type", "multi_field")
+//            .startObject("fields")
+//              .startObject("str")
+//                .field("type", "string")
+//                .field("index","analyzed")
+//                .field("analyzer", "default")
+//              .endObject()
+//              .startObject("num")
+//                .field("type", "long")
+//                .field("index","analyzed")
+//              .endObject()
+//          .endObject()
+//        .endObject()
+//      .endObject().endObject();
     } catch (IOException e) {
       LOG.error("Could not create mapping for {}",this.getIndexName());
       return null;

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index a4a86ca34ce13ad3c05578da0eca5443ec7d240b..666677b8207c4ec0c2440750881aa41517174da7 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -48,7 +48,7 @@ public abstract class BaseIndex<K extends Serializable> implements Index<K> {
   private static final String PROFILE_DOMAIN = "es";
   private static final Logger LOG = LoggerFactory.getLogger(BaseIndex.class);
 
-  public static final String ES_CLUSTER_NAME = "sonarcluster";
+  public static final String ES_CLUSTER_NAME = "sonarqube";
 
   private static final String LOCAL_ES_NODE_HOST = "localhost";
   private static final int LOCAL_ES_NODE_PORT = 9300;

diff --git a/sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json b/sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json
index 64913338ee0fce9d880d217f9f790e2be454d9e5..0e9c2e651c0b12cb4675d1868e9a139bd8fbdff0 100644 (file)
--- a/sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json
+++ b/sonar-server/src/main/resources/org/sonar/server/es/config/elasticsearch.json
@@ -4,7 +4,7 @@
   },
   "node": {
     "name": "sonarqube",
-    "local": true,
+    "local": false,
     "data": true
   },
   "discovery": {