fix quality flaws

2 files changed, 7 insertions, 2 deletions

diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index 486e8e612ef..8edce3858fd 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -144,6 +144,12 @@ public class SearchServer extends MonitoredProcess {
       .settings(esSettings)
       .build().start();
 
+    node.client().admin().indices()
+        .preparePutTemplate("default")
+        .setTemplate("*")
+        .addMapping("_default_", "{\"dynamic\": \"strict\"}")
+        .get();
+
     if (this.isBlocking) {
       while (node != null && !node.isClosed()) {
         try {
diff --git a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
index 4b65bcf0dff..aebc0c85984 100644
--- a/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
+++ b/server/sonar-search/src/test/java/org/sonar/search/SearchServerTest.java
@@ -46,7 +46,6 @@ import java.util.Properties;
 import static org.fest.assertions.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-@Ignore
 public class SearchServerTest {
 
   @Rule
@@ -82,6 +81,7 @@ public class SearchServerTest {
   }
 
   @Test
+  @Ignore
   public void server_fail_to_start() throws Exception {
     Properties properties = new Properties();
     properties.setProperty(MonitoredProcess.NAME_PROPERTY, "ES");
@@ -106,7 +106,6 @@ public class SearchServerTest {
       count++;
     }
     assertThat(count).isEqualTo(100);
-
   }
 
   @Test