SONAR-5692 support sonar.search.httpPort

2 files changed, 22 insertions, 3 deletions

diff --git a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
index cbea6781b51..127944bbda6 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
@@ -43,6 +43,7 @@ class EsSettings {
   public static final String PROP_NODE_NAME = "sonar.node.name";
   public static final String PROP_CLUSTER_NAME = "sonar.cluster.name";
   public static final String PROP_CLUSTER_MASTER = "sonar.cluster.master";
+  public static final String PROP_HTTP_PORT = "sonar.search.httpPort";
   public static final String PROP_MARVEL = "sonar.search.marvel";
 
   public static final String SONAR_PATH_HOME = "sonar.path.home";
@@ -134,9 +135,17 @@ class EsSettings {
     // disable multicast
     builder.put("discovery.zen.ping.multicast.enabled", "false");
 
-    builder
-      .put("transport.tcp.port", tcpPort)
-      .put("http.enabled", false);
+    builder.put("transport.tcp.port", tcpPort);
+
+    Integer httpPort = props.valueAsInt(PROP_HTTP_PORT);
+    if (httpPort ==null) {
+      // standard configuration
+      builder.put("http.enabled", false);
+    } else {
+      builder.put("http.enabled", true);
+      builder.put("http.host", "127.0.0.1");
+      builder.put("http.port", httpPort);
+    }
   }
 
   private void configureStorage(ImmutableSettings.Builder builder) {
diff --git a/server/sonar-search/src/test/java/org/sonar/search/EsSettingsTest.java b/server/sonar-search/src/test/java/org/sonar/search/EsSettingsTest.java
index cf6e21487bf..0f15c6918ff 100644
--- a/server/sonar-search/src/test/java/org/sonar/search/EsSettingsTest.java
+++ b/server/sonar-search/src/test/java/org/sonar/search/EsSettingsTest.java
@@ -123,7 +123,17 @@ public class EsSettingsTest {
     Settings settings = new EsSettings(props).build();
 
     assertThat(settings.get("marvel.agent.exporter.es.hosts")).isEqualTo("127.0.0.2,127.0.0.3");
+  }
+
+  @Test
+  public void enable_http_connector() throws Exception {
+    Props props = minProps();
+    props.set(EsSettings.PROP_HTTP_PORT, "9010");
+    Settings settings = new EsSettings(props).build();
 
+    assertThat(settings.get("http.port")).isEqualTo("9010");
+    assertThat(settings.get("http.host")).isEqualTo("127.0.0.1");
+    assertThat(settings.get("http.enabled")).isEqualTo("true");
   }
 
   private Props minProps() throws IOException {