Merge branch 'main' into upgrade_to_powsybl_dependencies_2024.4.0

Author: FranckLecuyer

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-security-analysis-server</artifactId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Security analysis server</name>
@@ -86,6 +86,11 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
+            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-ws-commons</artifactId>
+                <version>1.19.0</version>
+            </dependency>
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java

@@ -105,9 +105,6 @@ public SecurityAnalysisResult run(SecurityAnalysisRunContext runContext) {
             runContext.setNetwork(network);
             AtomicReference<ReportNode> rootReporter = new AtomicReference<>();
             return run(runContext, null, rootReporter);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return null;
         } catch (Exception e) {
             LOGGER.error(getFailedMessage(getComputationType()), e);
             return null;

src/main/resources/config/application.yaml

@@ -1,7 +1,7 @@
 spring:
   application:
     name: security-analysis-server
-  
+
   jpa:
     properties:
       hibernate:
@@ -20,6 +20,7 @@ spring:
           group: saGroup
           consumer:
             concurrency: 2
+            max-attempts: 1
         publishRun-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.run
         publishResult-out-0:
@@ -30,11 +31,21 @@ spring:
             destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.cancel
         publishStopped-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.stopped
-        publishFailed-out-0:
-          destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.failed
         publishCancelFailed-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.cancelfailed
-      output-bindings: publishRun-out-0;publishResult-out-0;publishCancel-out-0;publishStopped-out-0;publishFailed-out-;publishCancelFailed-out-0
+      output-bindings: publishRun-out-0;publishResult-out-0;publishCancel-out-0;publishStopped-out-0;publishCancelFailed-out-0
+      rabbit:
+        bindings:
+          consumeRun-in-0:
+            consumer:
+              auto-bind-dlq: true
+              dead-letter-exchange: ${powsybl-ws.rabbitmq.destination.prefix:}sa.run.dlx
+              dead-letter-queue-name: ${powsybl-ws.rabbitmq.destination.prefix:}sa.run.dlx.dlq
+              dead-letter-exchange-type: topic
+              quorum:
+                enabled: true
+                delivery-limit: 2
+
 
 powsybl-ws:
   database:
@@ -59,9 +70,6 @@ security-analysis:
         highBound: 75
       - nominalV: 90
         lowBound: 75
-        highBound: 120
-      - nominalV: 150
-        lowBound: 120
         highBound: 180
       - nominalV: 225
         lowBound: 180
@@ -70,23 +78,30 @@ security-analysis:
         lowBound: 300
         highBound: 500
     limitDurations:
-      - lowBound: 600
-        lowClosed: false
+      - lowBound: 1200
+        lowClosed: true
         highBound: ~
         highClosed: false
+      - lowBound: 600
+        lowClosed: true
+        highBound: 1200
+        highClosed: false
       - lowBound: 300
         lowClosed: true
         highBound: 600
-        highClosed: true
-      - lowBound: 0
+        highClosed: false
+      - lowBound: 60
         lowClosed: true
         highBound: 300
         highClosed: false
+      - lowBound: 0
+        lowClosed: true
+        highBound: 60
+        highClosed: false
     defaultValues:
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
-      - [ 1, 1, 1, 1 ]
+      - [ 1, 1, 1, 1, 1, 1 ]
+      - [ 1, 1, 1, 1, 1, 1 ]
+      - [ 1, 1, 1, 1, 1, 1 ]
+      - [ 1, 1, 1, 1, 1, 1 ]
+      - [ 1, 1, 0.95, 0.95, 0.9, 0.9 ]
+      - [ 1, 1, 0.95, 0.95, 0.9, 0.9 ]

src/main/resources/db/changelog/changesets/changelog_20241212T111835Z.xml

@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="jamalk (generated)" id="1734002324759-1">
+        <sql dbms="postgresql">
+            TRUNCATE TABLE limit_reduction_entity CASCADE;
+        </sql>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -36,3 +36,7 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20240705T122208Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20241212T111835Z.xml
+      relativeToChangelogFile: true
+

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java

@@ -75,6 +75,7 @@
 import static org.gridsuite.securityanalysis.server.util.TestUtils.assertLogMessage;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doNothing;
@@ -673,11 +674,8 @@ void runTestWithError() throws Exception {
         UUID resultUuid = mapper.readValue(resultAsString, UUID.class);
         assertEquals(RESULT_UUID, resultUuid);
 
-        // Message stopped has been sent
-        Message<byte[]> cancelMessage = output.receive(TIMEOUT, "sa.failed");
-        assertEquals(RESULT_UUID.toString(), cancelMessage.getHeaders().get("resultUuid"));
-        assertEquals("me", cancelMessage.getHeaders().get("receiver"));
-        assertEquals(getFailedMessage(COMPUTATION_TYPE) + " : " + ERROR_MESSAGE, cancelMessage.getHeaders().get("message"));
+        // No result message
+        assertNull(output.receive(TIMEOUT, "sa.result"));
 
         // No result
         assertResultNotFound(RESULT_UUID);