Merge branch 'fix-pq-diagram' of https://github.com/gridsuite/network…

…-modification-server into fix-pq-diagram
gridsuite · Dec 18, 2024 · 566a835 · 566a835
2 parents 11720c8 + 9214192
commit 566a835
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 68 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/elasticsearch/ESConfig.java b/src/main/java/org/gridsuite/modification/server/elasticsearch/ESConfig.java
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -19,12 +19,12 @@ gridsuite:
 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:
 
 powsybl-ws:
   database:

diff --git a/...est/java/org/gridsuite/modification/server/utils/elasticsearch/EmbeddedElasticsearch.java b/...est/java/org/gridsuite/modification/server/utils/elasticsearch/EmbeddedElasticsearch.java
@@ -42,8 +42,7 @@ public void postConstruct() {
         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