Merge branch 'main' into feat/rabbit-dlq-on-fail

gridsuite · Dec 13, 2024 · ea1df30 · ea1df30
2 parents a3580b6 + f684034
commit ea1df30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 68 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,6 +50,8 @@
         <liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
         <sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
         <network-modification.version>0.2.0</network-modification.version>
+        <!-- FIXME: powsybl-ws-commons module's version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-commons.version upgrade -->
+        <powsybl-ws-commons.version>1.18.0</powsybl-ws-commons.version>
     </properties>
 
     <build>
@@ -133,6 +135,8 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <version>${powsybl-ws-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

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