[IMG-1933] Update to powsybl-core v5.3.2

Update to groovy v3.0.15 Update to guava v32.0.1-jre Signed-off-by: Nicolas Rol <[email protected]>
powsybl · Jun 30, 2023 · 35b215a · 35b215a
1 parent b03883f
commit 35b215a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/afs-core/pom.xml b/afs-core/pom.xml
@@ -110,9 +110,8 @@
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-tools</artifactId>
+            <artifactId>powsybl-tools-test</artifactId>
             <version>${powsyblcore.version}</version>
-            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/afs-core/src/test/java/com/powsybl/afs/AppFileSystemToolTest.java b/afs-core/src/test/java/com/powsybl/afs/AppFileSystemToolTest.java
@@ -10,7 +10,7 @@
 import com.powsybl.afs.storage.AppStorage;
 import com.powsybl.afs.storage.NodeGenericMetadata;
 import com.powsybl.computation.ComputationManager;
-import com.powsybl.tools.AbstractToolTest;
+import com.powsybl.tools.test.AbstractToolTest;
 import com.powsybl.tools.Command;
 import com.powsybl.tools.Tool;
 import com.powsybl.tools.ToolRunningContext;

diff --git a/afs-ext-base/src/main/java/com/powsybl/afs/ext/base/ImportedCaseBuilder.java b/afs-ext-base/src/main/java/com/powsybl/afs/ext/base/ImportedCaseBuilder.java
@@ -20,7 +20,6 @@
 import com.powsybl.iidm.network.ExportersServiceLoader;
 import com.powsybl.iidm.network.ImportConfig;
 import com.powsybl.iidm.network.Importer;
-import com.powsybl.iidm.network.Importers;
 import com.powsybl.iidm.network.ImportersLoader;
 import com.powsybl.iidm.network.Network;
 
@@ -84,7 +83,7 @@ public ImportedCaseBuilder withCase(Case aCase) {
     }
 
     public ImportedCaseBuilder withFile(Path file) {
-        withDatasource(Importers.createDataSource(file));
+        withDatasource(DataSource.fromPath(file));
         if (name == null) {
             name = DataSourceUtil.getBaseName(file);
         }

diff --git a/afs-local/src/main/java/com/powsybl/afs/local/storage/LocalCase.java b/afs-local/src/main/java/com/powsybl/afs/local/storage/LocalCase.java
@@ -12,7 +12,6 @@
 import com.powsybl.commons.datasource.DataSource;
 import com.powsybl.commons.datasource.DataSourceUtil;
 import com.powsybl.iidm.network.Importer;
-import com.powsybl.iidm.network.Importers;
 import com.powsybl.timeseries.DoubleDataChunk;
 import com.powsybl.timeseries.StringDataChunk;
 import com.powsybl.timeseries.TimeSeriesMetadata;
@@ -67,7 +66,7 @@ public NodeGenericMetadata getGenericMetadata() {
 
     @Override
     public Optional<InputStream> readBinaryData(String name) {
-        DataSource dataSource = Importers.createDataSource(file);
+        DataSource dataSource = DataSource.fromPath(file);
         return AppStorageDataSource.Name.parse(name, new AppStorageDataSource.NameHandler<Optional<InputStream>>() {
             @Override
             public Optional<InputStream> onSuffixAndExtension(AppStorageDataSource.SuffixAndExtension suffixAndExtension) throws IOException {
@@ -88,7 +87,7 @@ public Optional<InputStream> onOther(AppStorageDataSource.Name name) {
 
     @Override
     public boolean dataExists(String name) {
-        DataSource dataSource = Importers.createDataSource(file);
+        DataSource dataSource = DataSource.fromPath(file);
         return AppStorageDataSource.Name.parse(name, new AppStorageDataSource.NameHandler<Boolean>() {
             @Override
             public Boolean onSuffixAndExtension(AppStorageDataSource.SuffixAndExtension suffixAndExtension) throws IOException {
@@ -109,7 +108,7 @@ public Boolean onOther(AppStorageDataSource.Name name) {
 
     @Override
     public Set<String> getDataNames() {
-        DataSource dataSource = Importers.createDataSource(file);
+        DataSource dataSource = DataSource.fromPath(file);
         try {
             Set<String> names = dataSource.listNames(".*");
             LOG.info("LocalCase::getDataNames()");

diff --git a/afs-local/src/main/java/com/powsybl/afs/local/storage/LocalCaseScanner.java b/afs-local/src/main/java/com/powsybl/afs/local/storage/LocalCaseScanner.java
@@ -7,6 +7,7 @@
 package com.powsybl.afs.local.storage;
 
 import com.google.auto.service.AutoService;
+import com.powsybl.commons.datasource.DataSource;
 import com.powsybl.commons.datasource.ReadOnlyDataSource;
 import com.powsybl.iidm.network.*;
 
@@ -37,7 +38,7 @@ public LocalCaseScanner(ImportConfig importConfig, ImportersLoader importersLoad
     @Override
     public LocalFile scanFile(Path path, LocalFileScannerContext context) {
         if (Files.isRegularFile(path)) {
-            ReadOnlyDataSource dataSource = Importers.createDataSource(path);
+            ReadOnlyDataSource dataSource = DataSource.fromPath(path);
             for (Importer importer : Importer.list(importersLoader, context.getComputationManager(), importConfig)) {
                 if (importer.exists(dataSource)) {
                     return new LocalCase(path, importer);

diff --git a/afs-ws/afs-ws-server/src/test/java/com/powsybl/afs/ws/server/AppDataBeanMock.java b/afs-ws/afs-ws-server/src/test/java/com/powsybl/afs/ws/server/AppDataBeanMock.java
@@ -19,7 +19,7 @@
 import javax.inject.Singleton;
 import java.util.Collections;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>

diff --git a/pom.xml b/pom.xml
@@ -78,16 +78,16 @@
         <autoservice.version>1.0-rc2</autoservice.version>
         <cassandra.version>4.10.0</cassandra.version>
         <cassandraunit.version>4.3.1.0</cassandraunit.version>
-        <groovy.version>3.0.7</groovy.version>
-        <guava.version>30.0-jre</guava.version>
+        <groovy.version>3.0.15</groovy.version>
+        <guava.version>32.0.1-jre</guava.version>
         <jackson.version>2.10.5</jackson.version>
         <javaeeapi.version>7.0</javaeeapi.version>
         <jimfs.version>1.1</jimfs.version>
         <jjwt.version>0.9.0</jjwt.version>
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13.1</junit.version>
         <mapdb.version>3.0.6</mapdb.version>
         <maven.core.version>3.3.9</maven.core.version>
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.8.0</mockito.version>
         <resteasy.version>3.1.4.Final</resteasy.version>
         <shrinkwrap-resolver.version>2.2.6</shrinkwrap-resolver.version>
         <slf4j.version>1.7.22</slf4j.version>
@@ -98,7 +98,7 @@
         <wildfly.dist.version>11.0.0.Final</wildfly.dist.version>
         <wildflyarquilliancontainerembedded.version>2.1.0.Final</wildflyarquilliancontainerembedded.version>
 
-        <powsyblcore.version>5.0.0</powsyblcore.version>
+        <powsyblcore.version>5.3.2</powsyblcore.version>
     </properties>
 
     <profiles>