From 2bf6a7342f8ceed8e00af1ceb35f0504f801105a Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 23 Jul 2025 17:29:15 +0200 Subject: [PATCH 1/2] use computation lib --- pom.xml | 7 +++++++ .../voltageinit/server/VoltageInitApplication.java | 2 +- .../server/service/NetworkModificationService.java | 2 +- .../server/service/VoltageInitObserver.java | 2 +- .../server/service/VoltageInitResultContext.java | 2 +- .../server/service/VoltageInitResultService.java | 2 +- .../server/service/VoltageInitRunContext.java | 4 ++-- .../voltageinit/server/service/VoltageInitService.java | 10 +++++----- .../server/service/VoltageInitWorkerService.java | 2 +- .../server/service/parameters/FilterService.java | 2 +- .../voltageinit/server/VoltageInitControllerTest.java | 8 ++++---- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 22eb8f5..80653ed 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,8 @@ 42.0.0 + + 1.0.0 0.14.0 0.13.0 5.0.0-alpha.14 @@ -178,6 +180,11 @@ org.gridsuite gridsuite-filter + + org.gridsuite + gridsuite-computation + ${gridsuite-computation.version} + com.powsybl powsybl-config-classic diff --git a/src/main/java/org/gridsuite/voltageinit/server/VoltageInitApplication.java b/src/main/java/org/gridsuite/voltageinit/server/VoltageInitApplication.java index c0a421e..a203e8b 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/VoltageInitApplication.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java index 9a1ac6b..0b843a8 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitObserver.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitObserver.java index 0bc6012..0c35588 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitObserver.java +++ b/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; /** diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java index 1226ef7..9378673 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java @@ -11,7 +11,7 @@ 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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java index b012c9b..cd0ca68 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitRunContext.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitRunContext.java index 712d0c7..e48902d 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitRunContext.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java index fe89d6a..a4ff8bd 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java index 2daf11d..4376d64 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java +++ b/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; diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/parameters/FilterService.java b/src/main/java/org/gridsuite/voltageinit/server/service/parameters/FilterService.java index 4dffc94..e809d4d 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/parameters/FilterService.java +++ b/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; diff --git a/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java b/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java index b244d14..80f81ba 100644 --- a/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java +++ b/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; From 478f05dd57386f662f25fc0e336259cf89eede5f Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Thu, 24 Jul 2025 17:29:20 +0200 Subject: [PATCH 2/2] override powsybl-ws-commons version --- pom.xml | 3 +++ .../gridsuite/voltageinit/server/VoltageInitController.java | 2 +- .../voltageinit/server/service/VoltageInitResultContext.java | 4 ++-- .../voltageinit/server/VoltageInitControllerTest.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 80653ed..f7a3fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,8 @@ 42.0.0 1.0.0 + + 1.28.0 0.14.0 0.13.0 5.0.0-alpha.14 @@ -150,6 +152,7 @@ com.powsybl powsybl-ws-commons + ${powsybl-ws-commons.version} org.springframework.cloud diff --git a/src/main/java/org/gridsuite/voltageinit/server/VoltageInitController.java b/src/main/java/org/gridsuite/voltageinit/server/VoltageInitController.java index baa201d..a69a50f 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/VoltageInitController.java +++ b/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; /** diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java index 9378673..9571fb6 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java +++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultContext.java @@ -18,8 +18,8 @@ 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 diff --git a/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java b/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java index 80f81ba..511082f 100644 --- a/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java +++ b/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java @@ -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.*;