Upgrade to powsybl dependencies 2024.2.0 (#136)

Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
gridsuite · Jul 29, 2024 · 7adbfbe · 7adbfbe
1 parent 75a5bfa
commit 7adbfbe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -43,10 +43,9 @@
 
     <properties>
         <jib.from.image>powsybl/java-dynawo:2.1.0</jib.from.image>
-        <gridsuite-dependencies.version>30</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>31</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
-        <powsybl-ws-commons.version>1.11.0</powsybl-ws-commons.version><!-- should be removed once gridsuite-dependencies is upgraded-->
     </properties>
 
     <build>
@@ -133,7 +132,6 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
-            <version>${powsybl-ws-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/...ain/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java b/...ain/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
@@ -15,7 +15,6 @@
 import com.powsybl.loadflow.LoadFlowResult;
 import com.powsybl.network.store.client.NetworkStoreService;
 import com.powsybl.security.*;
-import com.powsybl.security.detectors.DefaultLimitViolationDetector;
 import com.powsybl.ws.commons.LogUtils;
 import com.powsybl.ws.commons.computation.service.*;
 import org.gridsuite.securityanalysis.server.dto.ContingencyInfos;
@@ -28,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -69,7 +67,8 @@ public SecurityAnalysisResult run(SecurityAnalysisRunContext runContext) {
             Network network = getNetwork(runContext.getNetworkUuid(),
                     runContext.getVariantId());
             runContext.setNetwork(network);
-            return run(runContext, null);
+            AtomicReference<ReportNode> rootReporter = new AtomicReference<>();
+            return run(runContext, null, rootReporter);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             return null;
@@ -94,20 +93,17 @@ protected CompletableFuture<SecurityAnalysisResult> getCompletableFuture(Securit
                 .filter(Objects::nonNull)
                 .toList();
 
+        SecurityAnalysisRunParameters runParameters = new SecurityAnalysisRunParameters()
+            .setSecurityAnalysisParameters(runContext.getParameters())
+            .setComputationManager(executionService.getComputationManager())
+            .setFilter(LimitViolationFilter.load())
+            .setReportNode(runContext.getReportNode());
+
         return securityAnalysisRunner.runAsync(
                         runContext.getNetwork(),
                         variantId,
                         n -> contingencies,
-                        runContext.getParameters(),
-                        executionService.getComputationManager(),
-                        LimitViolationFilter.load(),
-                        new DefaultLimitViolationDetector(),
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        runContext.getReportNode())
+                        runParameters)
                 .thenApply(SecurityAnalysisReport::getResult);
     }
 

diff --git a/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisProviderMock.java b/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisProviderMock.java
@@ -6,19 +6,12 @@
  */
 package org.gridsuite.securityanalysis.server;
 
-import com.powsybl.commons.report.ReportNode;
-import com.powsybl.computation.ComputationManager;
 import com.powsybl.contingency.*;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.TwoSides;
 import com.powsybl.loadflow.LoadFlowResult;
 import com.powsybl.security.*;
-import com.powsybl.action.Action;
-import com.powsybl.security.interceptors.SecurityAnalysisInterceptor;
-import com.powsybl.security.limitreduction.LimitReduction;
-import com.powsybl.security.monitor.StateMonitor;
 import com.powsybl.security.results.PostContingencyResult;
-import com.powsybl.security.strategy.OperatorStrategy;
 import org.gridsuite.securityanalysis.server.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -199,17 +192,8 @@ static List<PreContingencyLimitViolationResultDTO> getResultPreContingencyWithNe
 
     public CompletableFuture<SecurityAnalysisReport> run(Network network,
                                                          String workingVariantId,
-                                                         LimitViolationDetector detector,
-                                                         LimitViolationFilter filter,
-                                                         ComputationManager computationManager,
-                                                         SecurityAnalysisParameters parameters,
                                                          ContingenciesProvider contingenciesProvider,
-                                                         List<SecurityAnalysisInterceptor> interceptors,
-                                                         List<OperatorStrategy> operatorStrategies,
-                                                         List<Action> actions,
-                                                         List<StateMonitor> monitors,
-                                                         List<LimitReduction> limitReductions,
-                                                         ReportNode reportNode) {
+                                                         SecurityAnalysisRunParameters parameters) {
         LOGGER.info("Run security analysis mock");
         switch (workingVariantId) {
             case VARIANT_3_ID -> {