use computation lib

pom.xml

@@ -50,6 +50,10 @@
 
     <properties>
         <gridsuite-dependencies.version>42.0.0</gridsuite-dependencies.version>
+        <!-- FIXME to remove at next upgrade of gridsuite-dependencies -->
+        <gridsuite-computation.version>1.0.0</gridsuite-computation.version>
+        <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
+        <powsybl-ws-commons.version>1.28.0</powsybl-ws-commons.version>
         <powsybl-open-reac.version>0.14.0</powsybl-open-reac.version>
         <powsybl-optimizer-commons.version>0.13.0</powsybl-optimizer-commons.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
@@ -148,6 +152,7 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
+            <version>${powsybl-ws-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -178,6 +183,11 @@
             <groupId>org.gridsuite</groupId>
             <artifactId>gridsuite-filter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gridsuite</groupId>
+            <artifactId>gridsuite-computation</artifactId>
+            <version>${gridsuite-computation.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-config-classic</artifactId>

src/main/java/org/gridsuite/voltageinit/server/VoltageInitApplication.java

@@ -7,7 +7,7 @@
 package org.gridsuite.voltageinit.server;
 
 import com.powsybl.network.store.client.NetworkStoreService;
-import com.powsybl.ws.commons.computation.service.NotificationService;
+import org.gridsuite.computation.service.NotificationService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

src/main/java/org/gridsuite/voltageinit/server/VoltageInitController.java

@@ -26,7 +26,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 
-import static com.powsybl.ws.commons.computation.service.NotificationService.HEADER_USER_ID;
+import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**

src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java

@@ -17,7 +17,7 @@
 import com.powsybl.iidm.network.Terminal;
 import com.powsybl.iidm.network.TwoWindingsTransformer;
 import com.powsybl.openreac.parameters.output.OpenReacResult;
-import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
+import org.gridsuite.computation.service.UuidGeneratorService;
 import org.gridsuite.voltageinit.server.dto.BusModificationInfos;
 import org.gridsuite.voltageinit.server.dto.GeneratorModificationInfos;
 import org.gridsuite.voltageinit.server.dto.ShuntCompensatorModificationInfos;

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitObserver.java

@@ -13,7 +13,7 @@
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.NonNull;
-import com.powsybl.ws.commons.computation.service.AbstractComputationObserver;
+import org.gridsuite.computation.service.AbstractComputationObserver;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java

@@ -11,15 +11,15 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.powsybl.commons.PowsyblException;
 import lombok.Getter;
-import com.powsybl.ws.commons.computation.service.AbstractResultContext;
+import org.gridsuite.computation.service.AbstractResultContext;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
 import java.io.UncheckedIOException;
 import java.util.*;
 
-import static com.powsybl.ws.commons.computation.service.NotificationService.HEADER_RECEIVER;
-import static com.powsybl.ws.commons.computation.service.NotificationService.HEADER_USER_ID;
+import static org.gridsuite.computation.service.NotificationService.HEADER_RECEIVER;
+import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID;
 
 /**
  * @author Etienne Homer <etienne.homer at rte-france.com>

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java

@@ -7,7 +7,7 @@
 package org.gridsuite.voltageinit.server.service;
 
 import com.powsybl.iidm.network.Bus;
-import com.powsybl.ws.commons.computation.service.AbstractComputationResultService;
+import org.gridsuite.computation.service.AbstractComputationResultService;
 import org.gridsuite.voltageinit.server.dto.VoltageInitStatus;
 import org.gridsuite.voltageinit.server.entities.BusVoltageEmbeddable;
 import org.gridsuite.voltageinit.server.entities.GlobalStatusEntity;

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitRunContext.java

@@ -7,8 +7,8 @@
 package org.gridsuite.voltageinit.server.service;
 
 import lombok.Getter;
-import com.powsybl.ws.commons.computation.dto.ReportInfos;
-import com.powsybl.ws.commons.computation.service.AbstractComputationRunContext;
+import org.gridsuite.computation.dto.ReportInfos;
+import org.gridsuite.computation.service.AbstractComputationRunContext;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java

@@ -9,11 +9,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.powsybl.network.store.client.NetworkStoreService;
 
-import com.powsybl.ws.commons.computation.dto.GlobalFilter;
-import com.powsybl.ws.commons.computation.service.AbstractComputationService;
-import com.powsybl.ws.commons.computation.service.NotificationService;
-import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
-import com.powsybl.ws.commons.computation.utils.FilterUtils;
+import org.gridsuite.computation.dto.GlobalFilter;
+import org.gridsuite.computation.service.AbstractComputationService;
+import org.gridsuite.computation.service.NotificationService;
+import org.gridsuite.computation.service.UuidGeneratorService;
+import org.gridsuite.computation.utils.FilterUtils;
 import org.gridsuite.voltageinit.server.dto.BusVoltage;
 import org.gridsuite.voltageinit.server.dto.ReactiveSlack;
 import org.gridsuite.voltageinit.server.dto.VoltageInitResult;

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java

@@ -18,7 +18,7 @@
 import com.powsybl.openreac.parameters.input.OpenReacParameters;
 import com.powsybl.openreac.parameters.output.OpenReacResult;
 import com.powsybl.openreac.parameters.output.OpenReacStatus;
-import com.powsybl.ws.commons.computation.service.*;
+import org.gridsuite.computation.service.*;
 import org.gridsuite.voltageinit.server.dto.VoltageInitStatus;
 import org.gridsuite.voltageinit.server.dto.parameters.VoltageInitParametersInfos;
 import org.gridsuite.voltageinit.server.service.parameters.VoltageInitParametersService;

src/main/java/org/gridsuite/voltageinit/server/service/parameters/FilterService.java

@@ -11,7 +11,7 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.network.store.client.NetworkStoreService;
 import com.powsybl.network.store.client.PreloadingStrategy;
-import com.powsybl.ws.commons.computation.dto.GlobalFilter;
+import org.gridsuite.computation.dto.GlobalFilter;
 import lombok.NonNull;
 import org.apache.commons.collections4.CollectionUtils;
 import org.gridsuite.filter.AbstractFilter;

src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java

@@ -33,10 +33,10 @@
 import com.powsybl.openreac.parameters.output.OpenReacResult;
 import com.powsybl.openreac.parameters.output.OpenReacStatus;
 import com.powsybl.openreac.parameters.output.ReactiveSlackOutput;
-import com.powsybl.ws.commons.computation.dto.GlobalFilter;
-import com.powsybl.ws.commons.computation.service.ReportService;
-import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
-import com.powsybl.ws.commons.computation.utils.annotations.PostCompletionAdapter;
+import org.gridsuite.computation.dto.GlobalFilter;
+import org.gridsuite.computation.service.ReportService;
+import org.gridsuite.computation.service.UuidGeneratorService;
+import org.gridsuite.computation.utils.annotations.PostCompletionAdapter;
 import lombok.SneakyThrows;
 import mockwebserver3.Dispatcher;
 import mockwebserver3.MockResponse;
@@ -91,7 +91,7 @@
 import java.util.concurrent.ForkJoinPool;
 
 import static com.powsybl.network.store.model.NetworkStoreApi.VERSION;
-import static com.powsybl.ws.commons.computation.service.NotificationService.*;
+import static org.gridsuite.computation.service.NotificationService.*;
 import static org.gridsuite.voltageinit.server.service.VoltageInitWorkerService.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;