Code cleanup to correct issues reported by Sonar (Severity: high - part 1)

action-api/src/test/java/com/powsybl/action/json/JsonActionTest.java

@@ -88,26 +88,31 @@ void actionRoundTrip() throws IOException {
     }
 
     @Test
-    void actionsReadV10() throws IOException {
+    void actionsReadV10() {
         ActionList actionList = ActionList.readJsonInputStream(getClass().getResourceAsStream("/ActionFileTestV1.0.json"));
         try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
             actionList.writeJsonOutputStream(bos);
             ComparisonUtils.compareTxt(getClass().getResourceAsStream("/ActionFileTest.json"), new ByteArrayInputStream(bos.toByteArray()));
+        } catch (Exception e) {
+            // Should not happen
+            fail();
         }
     }
 
     @Test
-    void wrongActions() {
-        final InputStream inputStream = getClass().getResourceAsStream("/WrongActionFileTest.json");
-        assertEquals("com.fasterxml.jackson.databind.JsonMappingException: for phase tap changer tap position action relative value field can't be null\n" +
-            " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 8, column: 3] (through reference chain: java.util.ArrayList[0])", assertThrows(UncheckedIOException.class, () ->
+    void wrongActions() throws IOException {
+        try (final InputStream inputStream = getClass().getResourceAsStream("/WrongActionFileTest.json")) {
+            assertEquals("com.fasterxml.jackson.databind.JsonMappingException: for phase tap changer tap position action relative value field can't be null\n" +
+                " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 8, column: 3] (through reference chain: java.util.ArrayList[0])", assertThrows(UncheckedIOException.class, () ->
                 ActionList.readJsonInputStream(inputStream)).getMessage());
+        }
 
-        final InputStream inputStream3 = getClass().getResourceAsStream("/ActionFileTestWrongVersion.json");
-        assertTrue(assertThrows(UncheckedIOException.class, () -> ActionList
+        try (final InputStream inputStream3 = getClass().getResourceAsStream("/ActionFileTestWrongVersion.json")) {
+            assertTrue(assertThrows(UncheckedIOException.class, () -> ActionList
                 .readJsonInputStream(inputStream3))
                 .getMessage()
                 .contains("actions. Tag: value is not valid for version 1.1. Version should be <= 1.0"));
+        }
     }
 
     @Test

action-ial/action-ial-simulator/src/test/java/com/powsybl/action/ial/simulator/PreDefinedConditionTest.java

@@ -10,6 +10,8 @@
 import com.powsybl.iidm.network.Network;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  * @author Geoffroy Jamgotchian {@literal <geoffroy.jamgotchian at rte-france.com>}
  */
@@ -32,6 +34,11 @@ protected String getDslFile() {
 
     @Test
     void test() {
-        engine.start(actionDb);
+        try {
+            engine.start(actionDb);
+        } catch (Exception e) {
+            // Should not happen
+            fail();
+        }
     }
 }

action-ial/action-ial-simulator/src/test/java/com/powsybl/action/ial/simulator/PreDefinedMethodsTest.java

@@ -11,6 +11,8 @@
 import com.powsybl.iidm.network.Network;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 class PreDefinedMethodsTest extends AbstractLoadFlowRulesEngineTest {
     @Override
     protected Network createNetwork() {
@@ -30,6 +32,11 @@ protected String getDslFile() {
 
     @Test
     void test() throws Exception {
-        engine.start(actionDb);
+        try {
+            engine.start(actionDb);
+        } catch (Exception e) {
+            // Should not happen
+            fail();
+        }
     }
 }

action-ial/action-ial-simulator/src/test/java/com/powsybl/action/ial/simulator/PropertyWithArgsTest.java

@@ -10,6 +10,8 @@
 import com.powsybl.iidm.network.Network;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  * @author Geoffroy Jamgotchian {@literal <geoffroy.jamgotchian at rte-france.com>}
  */
@@ -29,6 +31,11 @@ protected String getDslFile() {
 
     @Test
     void test() {
-        engine.start(actionDb);
+        try {
+            engine.start(actionDb);
+        } catch (Exception e) {
+            // Should not happen
+            fail();
+        }
     }
 }

ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplUtil.java

@@ -49,7 +49,7 @@ public static int getConnectableBusNum(StringToIntMapper<AmplSubset> mapper, Ter
     }
 
     private static void createLimitsIds(StringToIntMapper<AmplSubset> mapper, CurrentLimits limits, String branchId, String sideId) {
-        for (CurrentLimits.TemporaryLimit tl : limits.getTemporaryLimits()) {
+        for (LoadingLimits.TemporaryLimit tl : limits.getTemporaryLimits()) {
             String limitId = branchId + "_" + sideId + "_" + tl.getAcceptableDuration();
             mapper.newInt(AmplSubset.TEMPORARY_CURRENT_LIMIT, limitId);
         }

cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1Catalog.java

@@ -25,6 +25,10 @@
  */
 public final class CgmesConformity1Catalog {
 
+    private static final String UUID_STR_1 = "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66";
+    private static final String UUID_STR_2 = "urn:uuid:2399cbd1-9a39-11e0-aa80-0800200c9a66";
+    private static final String UUID_STR_3 = "urn:uuid:239ecbd2-9a39-11e0-aa80-0800200c9a66";
+
     private CgmesConformity1Catalog() {
     }
 
@@ -442,9 +446,9 @@ public static InMemoryCgmesModel expectedMicroGridBaseCaseBE() {
                 .synchronousMachinesGenerators("3a3b27be-b18b-4385-b557-6735d733baf0",
                         "550ebe0d-f2b2-48c1-991f-cebea43a21aa")
                 .modelProfiles("urn:uuid:0eb1540d-5ca3-40ab-9bf7-c91ec4c5d7c3",
-                        "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:2399cbd1-9a39-11e0-aa80-0800200c9a66",
+                        UUID_STR_1,
+                        UUID_STR_1,
+                        UUID_STR_2,
                         "urn:uuid:239caf0a-38bf-468b-a4d8-15f619886c58",
                         "urn:uuid:52b712d1-f3b0-4a59-9191-79f2fb1e4c4e",
                         "urn:uuid:9e383122-10cf-4da3-9785-f404b3541588",
@@ -941,12 +945,12 @@ private static InMemoryCgmesModel expectedMiniNodeBreaker() {
                 .asynchronousMachines("062ece1f-ade5-4d20-9c3a-fd8f12d12ec1",
                         "ba62884d-8800-41a8-9c26-698297d7ebaa",
                         "f184d87b-5565-45ee-89b4-29e8a42d3ad1")
-                .modelProfiles("urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:2399cbd1-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:239ecbd2-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:239ecbd2-9a39-11e0-aa80-0800200c9a66",
-                        "urn:uuid:239ecbd2-9a39-11e0-aa80-0800200c9a66",
+                .modelProfiles(UUID_STR_1,
+                        UUID_STR_1,
+                        UUID_STR_2,
+                        UUID_STR_3,
+                        UUID_STR_3,
+                        UUID_STR_3,
                         "urn:uuid:239scbd7-9a39-11e0-aa80-0800200c9a66",
                         "urn:uuid:239tcbd4-9a39-11e0-aa80-0800200c9a66",
                         "urn:uuid:239vcbd3-9a39-11e0-aa80-0800200c9a66");
@@ -1125,9 +1129,9 @@ public static CgmesModel expectedMicroGridType4BE() {
         m.staticVarCompensators("3c69652c-ff14-4550-9a87-b6fdaccbb5f4");
         m.modelProfiles().clear();
         m.modelProfiles("urn:uuid:1a64ce59-b28c-4b43-bf21-50b51865d777",
-                "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                "urn:uuid:2399cbd0-9a39-11e0-aa80-0800200c9a66",
-                "urn:uuid:2399cbd1-9a39-11e0-aa80-0800200c9a66",
+                UUID_STR_1,
+                UUID_STR_1,
+                UUID_STR_2,
                 "urn:uuid:75271ec4-af11-4a87-8137-d6d2b43b594d",
                 "urn:uuid:806f9f1b-ff69-4fb5-80f9-a8f393d31ebb",
                 "urn:uuid:80f1fec9-412f-4ca5-8706-d0d3382e9a71",

cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java

@@ -20,6 +20,11 @@
  */
 public final class CgmesConformity1ModifiedCatalog {
 
+    private static final String MICROGRID_REF_SWITCH = "/MicroGrid/BaseCase/BC_BE_v2_switch_at_boundary/";
+    private static final String MICROGRID_REF_TRANSFORMER = "/MicroGrid/BaseCase/BC_BE_v2_transformer_at_boundary/";
+    private static final String MICROGRID_REF_EQBRANCH = "/MicroGrid/BaseCase/BC_BE_v2_eqbranch_at_boundary/";
+    private static final String MICROGRID_CONFIGURATION = "/MicroGrid/BaseCase/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2/";
+
     private CgmesConformity1ModifiedCatalog() {
     }
 
@@ -397,7 +402,7 @@ public static GridModelReference microGridBaseCaseBESharedRegulatingControl() {
 
     public static GridModelReferenceResources microGridBaseCaseBESwitchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_switch_at_boundary/";
+                + MICROGRID_REF_SWITCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-SwitchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -411,7 +416,7 @@ public static GridModelReferenceResources microGridBaseCaseBESwitchAtBoundary()
 
     public static GridModelReferenceResources microGridBaseCaseBETransformerAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_transformer_at_boundary/";
+                + MICROGRID_REF_TRANSFORMER;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-TransformerAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -425,7 +430,7 @@ public static GridModelReferenceResources microGridBaseCaseBETransformerAtBounda
 
     public static GridModelReferenceResources microGridBaseCaseBEEquivalentBranchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_eqbranch_at_boundary/";
+                + MICROGRID_REF_EQBRANCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-EquivalentBranchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -601,7 +606,7 @@ public static GridModelReferenceResources microGridBaseCaseAssembledThreeLinesAt
 
     public static GridModelReferenceResources microGridBaseCaseAssembledSwitchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_switch_at_boundary/";
+                + MICROGRID_REF_SWITCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-Assembled-SwitchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -618,7 +623,7 @@ public static GridModelReferenceResources microGridBaseCaseAssembledSwitchAtBoun
 
     public static GridModelReferenceResources microGridBESwitchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_switch_at_boundary/";
+                + MICROGRID_REF_SWITCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-SwitchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -632,7 +637,7 @@ public static GridModelReferenceResources microGridBESwitchAtBoundary() {
 
     public static GridModelReferenceResources microGridBETransformerAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_transformer_at_boundary/";
+                + MICROGRID_REF_TRANSFORMER;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-TransformerAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -646,7 +651,7 @@ public static GridModelReferenceResources microGridBETransformerAtBoundary() {
 
     public static GridModelReferenceResources microGridBEEquivalentBranchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_eqbranch_at_boundary/";
+                + MICROGRID_REF_EQBRANCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-BE-EquivalentBranchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -660,7 +665,7 @@ public static GridModelReferenceResources microGridBEEquivalentBranchAtBoundary(
 
     public static GridModelReferenceResources microGridBaseCaseAssembledTransformerAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_transformer_at_boundary/";
+                + MICROGRID_REF_TRANSFORMER;
         return new GridModelReferenceResources("MicroGrid-BaseCase-Assembled-TransformerAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -677,7 +682,7 @@ public static GridModelReferenceResources microGridBaseCaseAssembledTransformerA
 
     public static GridModelReferenceResources microGridBaseCaseAssembledEquivalentBranchAtBoundary() {
         String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
-                + "/MicroGrid/BaseCase/BC_BE_v2_eqbranch_at_boundary/";
+                + MICROGRID_REF_EQBRANCH;
         return new GridModelReferenceResources("MicroGrid-BaseCase-Assembled-EquivalentBranchAtBoundary",
                 null,
                 new ResourceSet(baseModified,
@@ -1475,7 +1480,7 @@ public static GridModelReference microGridBaseCaseNLShuntCompensatorGP() {
         String base = ENTSOE_CONFORMITY_1_MODIFIED
                 + "/MicroGrid/BaseCase/BC_NL_v2_shunt_compensator_g_p/";
         String baseOriginal = ENTSOE_CONFORMITY_1
-                + "/MicroGrid/BaseCase/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2/";
+                + MICROGRID_CONFIGURATION;
         return new GridModelReferenceResources(
                 "MicroGrid-BaseCase-NL-sc-g-p",
                 null,
@@ -1490,7 +1495,7 @@ public static GridModelReference microGridBaseCaseNLSwitchWithoutName() {
         String base = ENTSOE_CONFORMITY_1_MODIFIED
                 + "/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/";
         String baseOriginal = ENTSOE_CONFORMITY_1
-                + "/MicroGrid/BaseCase/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2/";
+                + MICROGRID_CONFIGURATION;
         return new GridModelReferenceResources(
                 "MicroGrid-BaseCase-NL-switch-no-name",
                 null,
@@ -1504,7 +1509,7 @@ public static GridModelReference microGridBaseCaseNLSwitchTypePreserved() {
         String base = ENTSOE_CONFORMITY_1_MODIFIED
                 + "/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/";
         String baseOriginal = ENTSOE_CONFORMITY_1
-                + "/MicroGrid/BaseCase/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2/";
+                + MICROGRID_CONFIGURATION;
         return new GridModelReferenceResources(
                 "MicroGrid-BaseCase-NL-switch-type-preserved",
                 null,