update springboot to v2.7.18

Signed-off-by: Nicolas Rol <[email protected]>
powsybl · Jan 22, 2024 · 79ad0b9 · 79ad0b9
1 parent 98ee795
commit 79ad0b9
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 22 deletions.
diff --git a/afs-contingency/src/main/java/com/powsybl/afs/contingency/ContingencyStore.java b/afs-contingency/src/main/java/com/powsybl/afs/contingency/ContingencyStore.java
@@ -12,6 +12,7 @@
 import com.powsybl.afs.ProjectFileCreationContext;
 import com.powsybl.contingency.ContingenciesProvider;
 import com.powsybl.contingency.Contingency;
+import com.powsybl.contingency.contingency.list.ContingencyList;
 import com.powsybl.contingency.json.ContingencyJsonModule;
 import com.powsybl.iidm.network.Network;
 
@@ -68,6 +69,6 @@ public List<Contingency> read() {
 
     @Override
     public List<Contingency> getContingencies(Network network) {
-        return Contingency.checkValidity(read(), network);
+        return ContingencyList.getValidContingencies(read(), network);
     }
 }
diff --git a/afs-ext-base/src/main/java/com/powsybl/afs/ext/base/LocalNetworkCacheService.java b/afs-ext-base/src/main/java/com/powsybl/afs/ext/base/LocalNetworkCacheService.java
@@ -11,6 +11,7 @@
 import com.powsybl.commons.datasource.ReadOnlyDataSource;
 import com.powsybl.iidm.network.Importer;
 import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.NetworkFactory;
 import com.powsybl.iidm.network.NetworkListener;
 import groovy.json.JsonOutput;
 import org.slf4j.Logger;
@@ -49,7 +50,7 @@ private static ScriptResult<Network> loadNetworkFromImportedCase(ImportedCase im
         Importer importer = importedCase.getImporter();
         ReadOnlyDataSource dataSource = importedCase.getDataSource();
         Properties parameters = importedCase.getParameters();
-        Network network = importer.importData(dataSource, parameters);
+        Network network = importer.importData(dataSource, NetworkFactory.findDefault(), parameters);
         listeners.forEach(network::addListener);
         return ScriptResult.of(network);
     }

diff --git a/afs-ext-base/src/test/java/com/powsybl/afs/ext/base/TestImporter.java b/afs-ext-base/src/test/java/com/powsybl/afs/ext/base/TestImporter.java
@@ -13,6 +13,7 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.commons.parameters.Parameter;
 import com.powsybl.commons.parameters.ParameterType;
+import com.powsybl.iidm.network.NetworkFactory;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -60,7 +61,7 @@ public boolean exists(ReadOnlyDataSource dataSource) {
     }
 
     @Override
-    public Network importData(ReadOnlyDataSource dataSource, Properties parameters) {
+    public Network importData(ReadOnlyDataSource dataSource, NetworkFactory networkFactory, Properties parameters) {
         return network;
     }
 

diff --git a/afs-security-analysis/src/test/java/com/powsybl/afs/security/SecurityAnalysisRunnerTest.java b/afs-security-analysis/src/test/java/com/powsybl/afs/security/SecurityAnalysisRunnerTest.java
@@ -22,11 +22,7 @@
 import com.powsybl.commons.datasource.ReadOnlyDataSource;
 import com.powsybl.contingency.BranchContingency;
 import com.powsybl.contingency.Contingency;
-import com.powsybl.iidm.network.ImportConfig;
-import com.powsybl.iidm.network.Importer;
-import com.powsybl.iidm.network.ImportersLoader;
-import com.powsybl.iidm.network.ImportersLoaderList;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.loadflow.LoadFlowResult;
 import com.powsybl.security.*;
@@ -51,7 +47,7 @@ private static SecurityAnalysisResult createResult() {
         return new SecurityAnalysisResult(preContingencyResult, LoadFlowResult.ComponentResult.Status.CONVERGED, Collections.emptyList());
     }
 
-    private static class SecurityAnalysisServiceMock implements SecurityAnalysisRunningService {
+    private static final class SecurityAnalysisServiceMock implements SecurityAnalysisRunningService {
 
         @Override
         public void run(SecurityAnalysisRunner runner) {
@@ -60,7 +56,7 @@ public void run(SecurityAnalysisRunner runner) {
     }
 
     @AutoService(ServiceExtension.class)
-    public class SecurityAnalysisServiceExtensionMock implements ServiceExtension<SecurityAnalysisRunningService> {
+    public static class SecurityAnalysisServiceExtensionMock implements ServiceExtension<SecurityAnalysisRunningService> {
 
         @Override
         public ServiceKey<SecurityAnalysisRunningService> getServiceKey() {
@@ -73,7 +69,7 @@ public SecurityAnalysisRunningService createService(ServiceCreationContext conte
         }
     }
 
-    private static class ImporterMock implements Importer {
+    private static final class ImporterMock implements Importer {
 
         static final String FORMAT = "net";
 
@@ -93,9 +89,8 @@ public boolean exists(ReadOnlyDataSource dataSource) {
         }
 
         @Override
-        public Network importData(ReadOnlyDataSource dataSource, Properties parameters) {
-            Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
-            return network;
+        public Network importData(ReadOnlyDataSource dataSource, NetworkFactory networkFactory, Properties parameters) {
+            return EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
         }
 
         @Override

diff --git a/afs-spring-server/pom.xml b/afs-spring-server/pom.xml
@@ -64,7 +64,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-afs-ws-client</artifactId>
+            <artifactId>powsybl-afs-mapdb</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -76,14 +76,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-afs-ws-client</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-afs-mapdb</artifactId>
-            <version>${project.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/afs-spring-server/src/test/java/com/powsybl/afs/server/StorageServerTest.java b/afs-spring-server/src/test/java/com/powsybl/afs/server/StorageServerTest.java
@@ -26,7 +26,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
         <resteasy.version>3.14.0.Final</resteasy.version>
         <shrinkwrap-resolver.version>2.2.6</shrinkwrap-resolver.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <springboot.version>2.2.13.RELEASE</springboot.version>
+        <springboot.version>2.7.18</springboot.version>
         <swagger.version>2.2.7</swagger.version>
         <tyrus.version>1.13.1</tyrus.version>
         <wildfly.dist.version>11.0.0.Final</wildfly.dist.version>