Allow multiple elasticsearch hosts

pom.xml

@@ -121,6 +121,7 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
+            <version>1.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

src/main/java/com/powsybl/caseserver/SupervisionController.java

@@ -13,9 +13,10 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -31,23 +32,24 @@ public class SupervisionController {
 
     private final SupervisionService supervisionService;
     private final CaseService caseService;
-    private final ClientConfiguration elasticsearchClientConfiguration;
+    private final RestClient restClient;
     private final CaseInfosService caseInfosService;
 
-    public SupervisionController(SupervisionService supervisionService, CaseService caseService, ClientConfiguration elasticsearchClientConfiguration, CaseInfosService caseInfosService) {
+    public SupervisionController(SupervisionService supervisionService, CaseService caseService, RestClient restClient, CaseInfosService caseInfosService) {
         this.supervisionService = supervisionService;
         this.caseService = caseService;
-        this.elasticsearchClientConfiguration = elasticsearchClientConfiguration;
+        this.restClient = restClient;
         this.caseInfosService = caseInfosService;
     }
 
     @GetMapping(value = "/elasticsearch-host")
     @Operation(summary = "get the elasticsearch address")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "the elasticsearch address")})
     public ResponseEntity<String> getElasticsearchHost() {
-        String host = elasticsearchClientConfiguration.getEndpoints().get(0).getHostName()
+        HttpHost httpHost = restClient.getNodes().get(0).getHost();
+        String host = httpHost.getHostName()
                 + ":"
-                + elasticsearchClientConfiguration.getEndpoints().get(0).getPort();
+                + httpHost.getPort();
         return ResponseEntity.ok().contentType(MediaType.TEXT_PLAIN).body(host);
     }
 

src/main/java/com/powsybl/caseserver/elasticsearch/ESConfig.java

@@ -6,21 +6,16 @@
  */
 package com.powsybl.caseserver.elasticsearch;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
-import org.springframework.data.elasticsearch.client.ClientConfiguration;
-import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
+import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
-import java.util.Optional;
 
 /**
  * A class to configure DB elasticsearch client for metadatas transfer
@@ -29,41 +24,10 @@
  */
 
 @Configuration
-@EnableElasticsearchRepositories
-public class ESConfig extends ElasticsearchConfiguration {
+public class ESConfig extends ElasticsearchConfigurationSupport {
 
     public static final String CASE_INFOS_INDEX_NAME = "#{@environment.getProperty('powsybl-ws.elasticsearch.index.prefix')}cases";
 
-    @Value("#{'${spring.data.elasticsearch.embedded:false}' ? 'localhost' : '${spring.data.elasticsearch.host}'}")
-    private String esHost;
-
-    @Value("#{'${spring.data.elasticsearch.embedded:false}' ? '${spring.data.elasticsearch.embedded.port:}' : '${spring.data.elasticsearch.port}'}")
-    private int esPort;
-
-    @Value("${spring.data.elasticsearch.client.timeout:60}")
-    private int timeout;
-
-    @Value("${spring.data.elasticsearch.username:#{null}}")
-    private Optional<String> username;
-
-    @Value("${spring.data.elasticsearch.password:#{null}}")
-    private Optional<String> password;
-
-    //It should be detected without specifying the name, but it isn't. To investigate.
-    @Bean(name = "elasticsearchClientConfiguration")
-    @Override
-    public ClientConfiguration clientConfiguration() {
-        var clientConfiguration = ClientConfiguration.builder()
-                .connectedTo(esHost + ":" + esPort)
-                .withConnectTimeout(timeout * 1000L).withSocketTimeout(timeout * 1000L);
-
-        if (username.isPresent() && password.isPresent()) {
-            clientConfiguration.withBasicAuth(username.get(), password.get());
-        }
-
-        return clientConfiguration.build();
-    }
-
     @Override
     public ElasticsearchCustomConversions elasticsearchCustomConversions() {
         return new ElasticsearchCustomConversions(Arrays.asList(DateToStringConverter.INSTANCE, StringToDateConverter.INSTANCE));

src/main/resources/application-local.yml

@@ -5,12 +5,12 @@ spring:
   rabbitmq:
     addresses: localhost
 
-  data:
-    elasticsearch:
-      host: localhost
-      ## to fill if authentication is needed
-      # user:
-      # password:
+  elasticsearch:
+    uris:
+      - http://localhost:9200
+    ## to fill if authentication is needed
+    # username:
+    # password:
   cloud:
     aws:
       endpoint: http://localhost:19000

src/test/java/com/powsybl/caseserver/elasticsearch/EmbeddedElasticsearch.java

@@ -41,8 +41,7 @@ public void postConstruct() {
         envMap.put("ES_JAVA_OPTS", "-Xms128m -Xmx128m");
         envMap.put("action.auto_create_index", "false");
         elasticsearchContainer.start();
-        System.setProperty("spring.data.elasticsearch.embedded", Boolean.toString(true));
-        System.setProperty("spring.data.elasticsearch.embedded.port", Integer.toString(elasticsearchContainer.getMappedPort(9200)));
+        System.setProperty("spring.elasticsearch.uris", "localhost:".concat(Integer.toString(elasticsearchContainer.getMappedPort(9200))));
     }
 
     @PreDestroy