Merge branch 'main' of https://github.com/gridsuite/security-analysis-server into add-locationId-to-sa-result

Author: Slimane AMAR

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-security-analysis-server</artifactId>
-    <version>2.12.0-SNAPSHOT</version>
+    <version>2.13.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Security analysis server</name>
@@ -43,7 +43,7 @@
 
     <properties>
         <jib.from.image>powsybl/java-dynawo:2.1.0</jib.from.image>
-        <gridsuite-dependencies.version>35</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>36</gridsuite-dependencies.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>
@@ -89,11 +89,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
-            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-ws-commons</artifactId>
-                <version>1.19.0</version>
-            </dependency>
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>

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

@@ -60,7 +60,7 @@ public abstract class AbstractLimitViolationEntity {
 
     public static Double computeLoading(LimitViolation limitViolation) {
         return LimitViolationType.CURRENT.equals(limitViolation.getLimitType())
-                ? (100 * limitViolation.getValue()) / (limitViolation.getLimit() * limitViolation.getLimitReduction())
+                ? 100 * limitViolation.getValue() / limitViolation.getLimit()
                 : null;
     }
 }