Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java b/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java
index 8bb2aa2b65836790ae0da9ded0f5ae27ea70456d..587c6a771780a532fca9c6b9c820c3399f29ba17 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/DefaultIndexSettings.java
@@ -49,6 +49,8 @@ public class DefaultIndexSettings {
   public static final String INDEX_NOT_SEARCHABLE = "false";
   public static final String FIELD_TYPE_TEXT = "text";
   public static final String FIELD_TYPE_KEYWORD = "keyword";
+  public static final String NORMS = "norms";
+  public static final String STORE = "store";
   public static final String FIELD_FIELDDATA = "fielddata";
   public static final String FIELDDATA_ENABLED = "true";
   public static final String FIELD_TERM_VECTOR = "term_vector";

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
index 13701a250e4ddc43683c46c20dbd2a3d37a6a8fe..169b8284c7574891c2bdcb45ccd119c8d3617973 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
@@ -49,6 +49,8 @@ import static org.sonar.server.es.DefaultIndexSettings.FIELD_TYPE_TEXT;
 import static org.sonar.server.es.DefaultIndexSettings.INDEX;
 import static org.sonar.server.es.DefaultIndexSettings.INDEX_NOT_SEARCHABLE;
 import static org.sonar.server.es.DefaultIndexSettings.INDEX_SEARCHABLE;
+import static org.sonar.server.es.DefaultIndexSettings.NORMS;
+import static org.sonar.server.es.DefaultIndexSettings.STORE;
 import static org.sonar.server.es.DefaultIndexSettings.TYPE;
 import static org.sonar.server.es.DefaultIndexSettingsElement.UUID_MODULE_ANALYZER;
 
@@ -358,8 +360,8 @@ public class NewIndex {
       Map<String, Object> hash = new TreeMap<>();
       hash.put("type", getFieldType());
       hash.put(INDEX, disableSearch ? INDEX_NOT_SEARCHABLE : INDEX_SEARCHABLE);
-      hash.put("norms", valueOf(!disableNorms));
-      hash.put("store", valueOf(store));
+      hash.put(NORMS, valueOf(!disableNorms));
+      hash.put(STORE, valueOf(store));
       if (FIELD_TYPE_KEYWORD.equals(getFieldType())) {
         hash.put("doc_values", valueOf(!disabledDocValues));
       }
@@ -373,8 +375,8 @@ public class NewIndex {
       Map<String, Object> hash = new TreeMap<>();
       hash.put("type", getFieldType());
       hash.put(INDEX, disableSearch ? INDEX_NOT_SEARCHABLE : INDEX_SEARCHABLE);
-      hash.put("norms", "false");
-      hash.put("store", valueOf(store));
+      hash.put(NORMS, "false");
+      hash.put(STORE, valueOf(store));
       if (FIELD_TYPE_KEYWORD.equals(getFieldType())) {
         hash.put("doc_values", valueOf(!disabledDocValues));
       }
@@ -404,8 +406,8 @@ public class NewIndex {
     private Map<String, String> configureSubField(Map<String, String> subFieldMapping) {
       Map<String, String> subHash = new TreeMap<>(subFieldMapping);
       subHash.put(INDEX, INDEX_SEARCHABLE);
-      subHash.put("norms", "false");
-      subHash.put("store", valueOf(store));
+      subHash.put(NORMS, "false");
+      subHash.put(STORE, valueOf(store));
       if (termVectorWithPositionOffsets) {
         subHash.put(FIELD_TERM_VECTOR, "with_positions_offsets");
       }