From 7bf033019206136ac9e8b93b1325812d1792a758 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Tue, 27 May 2014 18:38:46 +0200
Subject: [PATCH] fix quality flaw (debug outputs)

---
 .../main/java/org/sonar/server/rule/index/RuleIndex.java   | 5 -----
 .../src/main/java/org/sonar/server/search/ESNode.java      | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index fa7fae0eb65..31adc98b849 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -106,11 +106,6 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
   @Override
   protected XContentBuilder getMapping() throws IOException {
 
-    for(IndexField indexField: RuleNormalizer.RuleField.ALL_FIELDS){
-      System.out.println("indexField = " + indexField);
-    }
-
-
     XContentBuilder mapping = jsonBuilder().startObject()
       .startObject(this.indexDefinition.getIndexType())
       .field("dynamic", true)
diff --git a/sonar-server/src/main/java/org/sonar/server/search/ESNode.java b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
index 158cfe2d7e9..b923743ee15 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
@@ -73,11 +73,8 @@ public class ESNode implements Startable {
   @Override
   public void start() {
 
-    IndexProperties.ES_TYPE type = IndexProperties.ES_TYPE.valueOf(settings.getString(IndexProperties.TYPE));
-
-    if(type == null){
-      type = IndexProperties.ES_TYPE.DATA;
-    }
+    IndexProperties.ES_TYPE type = settings.hasKey(IndexProperties.TYPE)?
+      IndexProperties.ES_TYPE.valueOf(IndexProperties.TYPE): IndexProperties.ES_TYPE.DATA;
 
     switch (type) {
       case MEMORY:
-- 
2.39.5