use computation lib

Author: ghazwarhili

pom.xml

@@ -44,6 +44,8 @@
     <properties>
         <!-- FIXME to remove at next upgrade of powsybl-ws-dependencies -->
         <powsybl-network-store.version>1.28.0</powsybl-network-store.version>
+        <!-- FIXME to remove at next upgrade of gridsuite-dependencies -->
+        <gridsuite-computation.version>1.0.0</gridsuite-computation.version>
         <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
         <gridsuite-dependencies.version>41.0.0</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
@@ -189,7 +191,8 @@
         </dependency>
         <dependency>
             <groupId>org.gridsuite</groupId>
-            <artifactId>gridsuite-filter</artifactId>
+            <artifactId>gridsuite-computation</artifactId>
+            <version>${gridsuite-computation.version}</version>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -281,11 +284,5 @@
             <artifactId>wiremock-jetty12</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.gridsuite</groupId>
-            <artifactId>gridsuite-computation</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -9,7 +9,7 @@
 import com.powsybl.iidm.network.ThreeSides;
 import com.powsybl.security.LimitViolationType;
 import com.powsybl.security.SecurityAnalysisResult;
-import com.powsybl.ws.commons.computation.dto.ReportInfos;
+import org.gridsuite.computation.dto.ReportInfos;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -34,9 +34,9 @@
 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 com.powsybl.ws.commons.computation.utils.FilterUtils.fromStringGlobalFiltersToDTO;
+import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID;
+import static org.gridsuite.computation.utils.FilterUtils.fromStringFiltersToDTO;
+import static org.gridsuite.computation.utils.FilterUtils.fromStringGlobalFiltersToDTO;
 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;