use computation lib v1.0.0

pom.xml

@@ -45,6 +45,10 @@
 
         <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
         <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>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
@@ -147,6 +151,7 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
+            <version>${powsybl-ws-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -168,6 +173,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gridsuite</groupId>
+            <artifactId>gridsuite-computation</artifactId>
+            <version>${gridsuite-computation.version}</version>
+        </dependency>
 
         <!-- Runtime dependencies -->
         <dependency>

src/main/java/org/gridsuite/securityanalysis/server/RestResponseEntityExceptionHandler.java

@@ -6,7 +6,7 @@
  */
 package org.gridsuite.securityanalysis.server;
 
-import com.powsybl.ws.commons.computation.ComputationException;
+import org.gridsuite.computation.ComputationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

src/main/java/org/gridsuite/securityanalysis/server/SecurityAnalysisApplication.java

@@ -7,7 +7,7 @@
 package org.gridsuite.securityanalysis.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/securityanalysis/server/SecurityAnalysisController.java

@@ -16,7 +16,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import com.powsybl.ws.commons.computation.dto.ReportInfos;
+import org.gridsuite.computation.dto.ReportInfos;
 import org.gridsuite.securityanalysis.server.dto.*;
 import org.gridsuite.securityanalysis.server.service.SecurityAnalysisParametersService;
 import org.gridsuite.securityanalysis.server.service.SecurityAnalysisResultService;
@@ -34,8 +34,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.powsybl.ws.commons.computation.service.NotificationService.HEADER_USER_ID;
-import static com.powsybl.ws.commons.computation.utils.FilterUtils.fromStringFiltersToDTO;
+import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID;
+import static org.gridsuite.computation.utils.FilterUtils.fromStringFiltersToDTO;
 import static org.springframework.http.MediaType.*;
 
 /**

src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java

@@ -8,7 +8,7 @@
 
 import com.powsybl.iidm.network.Network;
 import com.powsybl.security.LimitViolation;
-import com.powsybl.ws.commons.computation.utils.ComputationResultUtils;
+import org.gridsuite.computation.utils.ComputationResultUtils;
 import jakarta.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;

src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java

@@ -9,7 +9,7 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.security.LimitViolation;
 import com.powsybl.security.results.PreContingencyResult;
-import com.powsybl.ws.commons.computation.utils.ComputationResultUtils;
+import org.gridsuite.computation.utils.ComputationResultUtils;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.Getter;

src/main/java/org/gridsuite/securityanalysis/server/repositories/specifications/ContingencySpecificationBuilder.java

@@ -7,9 +7,9 @@
 package org.gridsuite.securityanalysis.server.repositories.specifications;
 
 import com.powsybl.loadflow.LoadFlowResult;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.specification.AbstractCommonSpecificationBuilder;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.specification.AbstractCommonSpecificationBuilder;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Root;
 import org.gridsuite.securityanalysis.server.entities.ContingencyEntity;

src/main/java/org/gridsuite/securityanalysis/server/repositories/specifications/PreContingencyLimitViolationSpecificationBuilder.java

@@ -6,8 +6,8 @@
  */
 package org.gridsuite.securityanalysis.server.repositories.specifications;
 
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import org.gridsuite.securityanalysis.server.entities.PreContingencyLimitViolationEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;

src/main/java/org/gridsuite/securityanalysis/server/repositories/specifications/SubjectLimitViolationSpecificationBuilder.java

@@ -6,9 +6,9 @@
  */
 package org.gridsuite.securityanalysis.server.repositories.specifications;
 
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.specification.AbstractCommonSpecificationBuilder;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.specification.AbstractCommonSpecificationBuilder;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Root;
 import org.gridsuite.securityanalysis.server.entities.SecurityAnalysisResultEntity;

src/main/java/org/gridsuite/securityanalysis/server/service/LimitReductionService.java

@@ -6,7 +6,7 @@
  */
 package org.gridsuite.securityanalysis.server.service;
 
-import com.powsybl.ws.commons.computation.ComputationException;
+import org.gridsuite.computation.ComputationException;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.Range;

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisObserver.java

@@ -11,7 +11,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.NonNull;
-import com.powsybl.ws.commons.computation.service.AbstractComputationObserver;
+import org.gridsuite.computation.service.AbstractComputationObserver;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersDTO;
 import org.springframework.stereotype.Service;
 

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java

@@ -7,8 +7,8 @@
 package org.gridsuite.securityanalysis.server.service;
 
 import com.powsybl.security.SecurityAnalysisParameters;
-import com.powsybl.ws.commons.computation.ComputationException;
-import com.powsybl.ws.commons.computation.dto.ReportInfos;
+import org.gridsuite.computation.ComputationException;
+import org.gridsuite.computation.dto.ReportInfos;
 import lombok.NonNull;
 import org.gridsuite.securityanalysis.server.dto.*;
 import org.gridsuite.securityanalysis.server.entities.SecurityAnalysisParametersEntity;
@@ -19,7 +19,7 @@
 
 import java.util.*;
 
-import static com.powsybl.ws.commons.computation.ComputationException.Type.PARAMETERS_NOT_FOUND;
+import static org.gridsuite.computation.ComputationException.Type.PARAMETERS_NOT_FOUND;
 
 /**
  * @author Abdelsalem HEDHILI <[email protected]>

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisResultContext.java

@@ -8,17 +8,17 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.powsybl.ws.commons.computation.dto.ReportInfos;
-import com.powsybl.ws.commons.computation.service.AbstractResultContext;
+import org.gridsuite.computation.dto.ReportInfos;
+import org.gridsuite.computation.service.AbstractResultContext;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersDTO;
 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.*;
-import static com.powsybl.ws.commons.computation.utils.MessageUtils.getNonNullHeader;
+import static org.gridsuite.computation.service.NotificationService.*;
+import static org.gridsuite.computation.utils.MessageUtils.getNonNullHeader;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisResultService.java

@@ -11,10 +11,10 @@
 import com.powsybl.iidm.network.ThreeSides;
 import com.powsybl.security.LimitViolationType;
 import com.powsybl.security.SecurityAnalysisResult;
-import com.powsybl.ws.commons.computation.ComputationException;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.service.AbstractComputationResultService;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.ComputationException;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.service.AbstractComputationResultService;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import lombok.Getter;
 import org.gridsuite.securityanalysis.server.dto.*;
 import org.gridsuite.securityanalysis.server.entities.*;
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.powsybl.ws.commons.computation.utils.FilterUtils.fromStringFiltersToDTO;
+import static org.gridsuite.computation.utils.FilterUtils.fromStringFiltersToDTO;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisRunContext.java

@@ -12,8 +12,8 @@
 import com.powsybl.loadflow.LoadFlowProvider;
 import lombok.Getter;
 import lombok.Setter;
-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 org.gridsuite.securityanalysis.server.dto.ContingencyInfos;
 import org.gridsuite.securityanalysis.server.dto.LoadFlowParametersValues;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersDTO;

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java

@@ -10,9 +10,9 @@
 import com.powsybl.iidm.network.ThreeSides;
 import com.powsybl.security.LimitViolationType;
 import com.powsybl.security.SecurityAnalysisProvider;
-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 org.gridsuite.computation.service.AbstractComputationService;
+import org.gridsuite.computation.service.NotificationService;
+import org.gridsuite.computation.service.UuidGeneratorService;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java

@@ -27,7 +27,7 @@
 import com.powsybl.security.*;
 import com.powsybl.security.limitreduction.LimitReduction;
 import com.powsybl.ws.commons.LogUtils;
-import com.powsybl.ws.commons.computation.service.*;
+import org.gridsuite.computation.service.*;
 import org.gridsuite.securityanalysis.server.dto.ContingencyInfos;
 import org.gridsuite.securityanalysis.server.dto.LimitReductionsByVoltageLevel;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersDTO;
@@ -40,14 +40,17 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static com.powsybl.ws.commons.computation.service.NotificationService.getFailedMessage;
+import static org.gridsuite.computation.service.NotificationService.getFailedMessage;
 import static org.gridsuite.securityanalysis.server.service.SecurityAnalysisService.COMPUTATION_TYPE;
 
 /**

src/main/java/org/gridsuite/securityanalysis/server/util/CsvExportUtils.java

@@ -1,6 +1,6 @@
 package org.gridsuite.securityanalysis.server.util;
 
-import com.powsybl.ws.commons.computation.ComputationException;
+import org.gridsuite.computation.ComputationException;
 import com.univocity.parsers.csv.CsvFormat;
 import com.univocity.parsers.csv.CsvWriter;
 import com.univocity.parsers.csv.CsvWriterSettings;

src/test/java/org/gridsuite/securityanalysis/server/FindContingenciesTest.java

@@ -11,9 +11,9 @@
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import com.powsybl.security.LimitViolationType;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.ComputationException;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.ComputationException;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import org.gridsuite.securityanalysis.server.dto.ContingencyResultDTO;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
 import org.gridsuite.securityanalysis.server.dto.SubjectLimitViolationDTO;

src/test/java/org/gridsuite/securityanalysis/server/FindPreContingencyLimitViolationTest.java

@@ -8,8 +8,8 @@
 
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.ThreeSides;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import org.gridsuite.securityanalysis.server.dto.*;

src/test/java/org/gridsuite/securityanalysis/server/FindSubjectLimitViolationsTest.java

@@ -11,9 +11,9 @@
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import com.powsybl.security.LimitViolationType;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.ComputationException;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.ComputationException;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import org.gridsuite.securityanalysis.server.dto.ContingencyLimitViolationDTO;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
 import org.gridsuite.securityanalysis.server.dto.SubjectLimitViolationResultDTO;

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java

@@ -24,10 +24,10 @@
 import com.powsybl.network.store.client.PreloadingStrategy;
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import com.powsybl.security.*;
-import com.powsybl.ws.commons.computation.dto.ResourceFilterDTO;
-import com.powsybl.ws.commons.computation.service.ReportService;
-import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
-import com.powsybl.ws.commons.computation.utils.SpecificationUtils;
+import org.gridsuite.computation.dto.ResourceFilterDTO;
+import org.gridsuite.computation.service.ReportService;
+import org.gridsuite.computation.service.UuidGeneratorService;
+import org.gridsuite.computation.utils.SpecificationUtils;
 import com.vladmihalcea.sql.SQLStatementCountValidator;
 import org.assertj.core.api.Assertions;
 import org.gridsuite.securityanalysis.server.dto.*;
@@ -69,7 +69,7 @@
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 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.securityanalysis.server.SecurityAnalysisProviderMock.*;
 import static org.gridsuite.securityanalysis.server.service.SecurityAnalysisService.COMPUTATION_TYPE;
 import static org.gridsuite.securityanalysis.server.util.DatabaseQueryUtils.assertRequestsCount;

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisParametersControllerTest.java

@@ -8,7 +8,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.powsybl.ws.commons.computation.ComputationException;
+import org.gridsuite.computation.ComputationException;
 import org.gridsuite.securityanalysis.server.dto.LimitReductionsByVoltageLevel;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersValues;
 import org.gridsuite.securityanalysis.server.entities.SecurityAnalysisParametersEntity;
@@ -30,7 +30,7 @@
 import java.util.UUID;
 
 import static com.powsybl.network.store.model.NetworkStoreApi.VERSION;
-import static com.powsybl.ws.commons.computation.ComputationException.Type.PARAMETERS_NOT_FOUND;
+import static org.gridsuite.computation.ComputationException.Type.PARAMETERS_NOT_FOUND;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisProviderMock.java

@@ -14,7 +14,7 @@
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import com.powsybl.security.*;
 import com.powsybl.security.results.PostContingencyResult;
-import com.powsybl.ws.commons.computation.utils.ComputationResultUtils;
+import org.gridsuite.computation.utils.ComputationResultUtils;
 import org.gridsuite.securityanalysis.server.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test/java/org/gridsuite/securityanalysis/server/util/TestUtils.java

@@ -1,7 +1,7 @@
 package org.gridsuite.securityanalysis.server.util;
 
 import com.powsybl.commons.report.ReportNode;
-import com.powsybl.ws.commons.computation.service.ReportService;
+import org.gridsuite.computation.service.ReportService;
 import org.apache.commons.text.StringSubstitutor;
 import org.mockito.ArgumentCaptor;