Code cleanup to correct issues reported by Sonar (Consistency)

action-ial/action-ial-dsl/src/test/java/com/powsybl/action/ial/dsl/GeneratorModificationActionTest.java

@@ -16,6 +16,12 @@
 import groovy.lang.GroovyCodeSource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -36,7 +42,7 @@ void setUp() {
     @Test
     void testExceptionOnWrongGeneratorId() {
         ActionDb actionDb = new ActionDslLoader(
-                new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+                new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("unknown generator");
         NetworkModification genModif = action.getModifications().get(0);
         // should throw with ThrowException = true
@@ -48,7 +54,7 @@ void testExceptionOnWrongGeneratorId() {
 
     @Test
     void testTargetVAndQWithVoltageRegulatorOff() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("targetV and targetQ with voltageRegulator OFF");
         action.run(network);
         assertEquals(20., g.getMinP(), 0.1);
@@ -61,63 +67,43 @@ void testTargetVAndQWithVoltageRegulatorOff() {
 
     @Test
     void testTargetVAndQWithVoltageRegulatorOn() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("targetV and targetQ with voltageRegulator ON");
         action.run(network);
         assertEquals(10, g.getTargetV(), 0.1);
         assertEquals(25., g.getTargetQ(), 0.1);
         assertTrue(g.isVoltageRegulatorOn());
     }
 
-    @Test
-    void testDeltaTargetPInBoundaries() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
-        Action action = actionDb.getAction("deltaTargetP within boundaries");
-        action.run(network);
-        assertEquals(606., g.getTargetP(), 0.1);
-    }
-
-    @Test
-    void testDeltaTargetPLowerBoundaryOverflow() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
-        Action action = actionDb.getAction("deltaTargetP lower boundary overflow");
-        action.run(network);
-        assertEquals(-9999.99, g.getTargetP(), 0.1);
-    }
-
-    @Test
-    void testDeltaTargetPUpperBoundaryOverflow() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
-        Action action = actionDb.getAction("deltaTargetP upper boundary overflow");
-        action.run(network);
-        assertEquals(9999.99, g.getTargetP(), 0.1);
-    }
-
-    @Test
-    void testTargetPLowerBoundaryOverflow() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
-        Action action = actionDb.getAction("targetP lower boundary overflow");
-        action.run(network);
-        assertEquals(-9999.99, g.getTargetP(), 0.1);
+    static Stream<Arguments> getArguments() {
+        return Stream.of(
+            Arguments.of("deltaTargetP within boundaries", 606.),
+            Arguments.of("deltaTargetP upper boundary overflow", 9999.99),
+            Arguments.of("deltaTargetP lower boundary overflow", -9999.99),
+            Arguments.of("targetP upper boundary overflow", 9999.99),
+            Arguments.of("targetP lower boundary overflow", -9999.99)
+        );
     }
 
-    @Test
-    void testTargetPUpperBoundaryOverflow() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
-        Action action = actionDb.getAction("targetP upper boundary overflow");
+    @ParameterizedTest
+    @MethodSource("getArguments")
+    void testActionsFromDb(String actionName, double expectedValue) {
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
+        Action action = actionDb.getAction(actionName);
         action.run(network);
-        assertEquals(9999.99, g.getTargetP(), 0.1);
+        assertEquals(expectedValue, g.getTargetP(), 0.1);
     }
 
     @Test
     void testBothTargetpAndDeltaTargetP() {
-        PowsyblException e = assertThrows(PowsyblException.class, () -> new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/exception-generator-modification-action.groovy"))).load(network));
+        ActionDslLoader actionDslLoader = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/exception-generator-modification-action.groovy"))));
+        PowsyblException e = assertThrows(PowsyblException.class, () -> actionDslLoader.load(network));
         assertTrue(e.getMessage().contains("targetP/deltaTargetP actions are both found in generatorModification on 'GEN'"));
     }
 
     @Test
     void testConnectionOnOff() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("disconnect");
         action.run(network);
         assertFalse(g.getTerminal().isConnected());
@@ -128,7 +114,7 @@ void testConnectionOnOff() {
 
     @Test
     void testConnectionOnOffWithTargetPChange() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("disconnect with targetP change");
         action.run(network);
         assertFalse(g.getTerminal().isConnected());
@@ -141,7 +127,7 @@ void testConnectionOnOffWithTargetPChange() {
 
     @Test
     void testAlreadyAtTheConnectionStateAsked() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("connect");
         action.run(network);
         assertTrue(g.getTerminal().isConnected());
@@ -154,7 +140,7 @@ void testAlreadyAtTheConnectionStateAsked() {
 
     @Test
     void testConnectionOnOffWithTargetVChange() {
-        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/generator-modification-action.groovy"))).load(network);
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(Objects.requireNonNull(getClass().getResource("/generator-modification-action.groovy")))).load(network);
         Action action = actionDb.getAction("disconnect");
         action.run(network);
         assertFalse(g.getTerminal().isConnected());

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Conversion.java

@@ -810,9 +810,10 @@ private void voltageAngles(PropertyBags nodes, Context context) {
     private void clearUnattachedHvdcConverterStations(Network network, Context context) {
         network.getHvdcConverterStationStream()
                 .filter(converter -> converter.getHvdcLine() == null)
-                .peek(converter -> context.ignored("HVDC Converter Station " + converter.getId(), "No correct linked HVDC line found."))
-                .toList()
-                .forEach(Connectable::remove);
+                .forEach(converter -> {
+                    context.ignored("HVDC Converter Station " + converter.getId(), "No correct linked HVDC line found.");
+                    converter.remove();
+                });
     }
 
     private void debugTopology(Context context) {

cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java

@@ -17,7 +17,10 @@
 import com.powsybl.cgmes.conversion.PhaseAngleClock;
 import com.powsybl.cgmes.model.GridModelReference;
 import com.powsybl.commons.PowsyblException;
-import com.powsybl.iidm.network.*;
+import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.Terminal;
+import com.powsybl.iidm.network.ThreeWindingsTransformer;
+import com.powsybl.iidm.network.TwoWindingsTransformer;
 import com.powsybl.loadflow.LoadFlowParameters;
 import com.powsybl.loadflow.validation.ValidationConfig;
 import org.junit.jupiter.api.Test;
@@ -37,6 +40,8 @@
  */
 class TransformerConversionTest {
 
+    private static final String EQUALS_LINE = "======================";
+
     @Test
     void microGridBaseCaseBExfmr2ShuntDefault() {
         Conversion.Config config = new Conversion.Config();
@@ -199,8 +204,16 @@ void microGridBaseCaseBExfmr2Ratio0X() {
         assertTrue(ok);
     }
 
+    /**
+     * Default test for:
+     * <ul>
+     *     <li>microGridBaseCaseBExfmr3Shunt</ul>
+     *     <li>microGridBaseCaseBExfmr3RatioPhase</ul>
+     *     <li>microGridBaseCaseBExfmr3Ratio0</ul>
+     * </ul>
+     */
     @Test
-    void microGridBaseCaseBExfmr3ShuntDefault() {
+    void microGridBaseCaseDefault() {
         Conversion.Config config = new Conversion.Config();
         Network n = networkModel(CgmesConformity1Catalog.microGridBaseCaseBE(), config);
 
@@ -243,16 +256,6 @@ void microGridBaseCaseBExfmr3ShuntSplit() {
         assertTrue(ok);
     }
 
-    @Test
-    void microGridBaseCaseBExfmr3RatioPhaseDefault() {
-        Conversion.Config config = new Conversion.Config();
-        Network n = networkModel(CgmesConformity1Catalog.microGridBaseCaseBE(), config);
-
-        // RatioTapChanger
-        boolean ok = t3xCompareFlow(n, "84ed55f4-61f5-4d9d-8755-bba7b877a246", 99.227288, 2.747147, -216.195867, -85.490493, 117.988318, 92.500849);
-        assertTrue(ok);
-    }
-
     @Test
     void microGridBaseCaseBExfmr3RatioPhaseNetworkSide() {
         Conversion.Config config = new Conversion.Config();
@@ -275,16 +278,6 @@ void microGridBaseCaseBExfmr3RatioPhaseStarBusSide() {
         assertTrue(ok);
     }
 
-    @Test
-    void microGridBaseCaseBExfmr3Ratio0Default() {
-        Conversion.Config config = new Conversion.Config();
-        Network n = networkModel(CgmesConformity1Catalog.microGridBaseCaseBE(), config);
-
-        // RatioTapChanger
-        boolean ok = t3xCompareFlow(n, "84ed55f4-61f5-4d9d-8755-bba7b877a246", 99.227288, 2.747147, -216.195867, -85.490493, 117.988318, 92.500849);
-        assertTrue(ok);
-    }
-
     @Test
     void microGridBaseCaseBExfmr3Ratio0StarBusSide() {
         Conversion.Config config = new Conversion.Config();
@@ -423,7 +416,7 @@ private boolean t2xCompareFlow(Network n, String id, double p1, double q1, doubl
             LOG.error(String.format("TransformerConversionTest: TwoWindingsTransformer id %s ===", id));
             LOG.error(String.format("Expected P1 %12.6f Q1 %12.6f P2 %12.6f Q2 %12.6f", expected.p1, expected.q1, expected.p2, expected.q2));
             LOG.error(String.format("Actual   P1 %12.6f Q1 %12.6f P2 %12.6f Q2 %12.6f", actual.p1, actual.q1, actual.p2, actual.q2));
-            LOG.error("======================");
+            LOG.error(EQUALS_LINE);
         }
         return ok;
     }
@@ -443,7 +436,7 @@ private boolean t3xCompareFlow(Network n, String id, double p1, double q1, doubl
                 expected.q1, expected.p2, expected.q2, expected.p3, expected.q3));
             LOG.error(String.format("Actual   P1 %12.6f Q1 %12.6f P2 %12.6f Q2 %12.6f P3 %12.6f Q3 %12.6f", actual.p1,
                 actual.q1, actual.p2, actual.q2, actual.p3, actual.q3));
-            LOG.error("======================");
+            LOG.error(EQUALS_LINE);
         }
         return ok;
     }
@@ -521,20 +514,20 @@ private boolean sameFlow(T2xFlow expected, T2xFlow actual) {
         double tol = 0.00001;
         // Comparison fails if actual has NaN values
         return Math.abs(expected.p1 - actual.p1) <= tol &&
-                Math.abs(expected.q1 - actual.q1) <= tol &&
-                Math.abs(expected.p2 - actual.p2) <= tol &&
-                Math.abs(expected.q2 - actual.q2) <= tol;
+            Math.abs(expected.q1 - actual.q1) <= tol &&
+            Math.abs(expected.p2 - actual.p2) <= tol &&
+            Math.abs(expected.q2 - actual.q2) <= tol;
     }
 
     private boolean sameFlow(T3xFlow expected, T3xFlow actual) {
         double tol = 0.00001;
         // Comparison fails if actual has NaN values
         return Math.abs(expected.p1 - actual.p1) <= tol &&
-                Math.abs(expected.q1 - actual.q1) <= tol &&
-                Math.abs(expected.p2 - actual.p2) <= tol &&
-                Math.abs(expected.q2 - actual.q2) <= tol &&
-                Math.abs(expected.p3 - actual.p3) <= tol &&
-                Math.abs(expected.q3 - actual.q3) <= tol;
+            Math.abs(expected.q1 - actual.q1) <= tol &&
+            Math.abs(expected.p2 - actual.p2) <= tol &&
+            Math.abs(expected.q2 - actual.q2) <= tol &&
+            Math.abs(expected.p3 - actual.p3) <= tol &&
+            Math.abs(expected.q3 - actual.q3) <= tol;
     }
 
     private LoadFlowParameters defineLoadflowParameters(LoadFlowParameters loadFlowParameters, Conversion.Config config) {
@@ -562,7 +555,7 @@ private LoadFlowParameters defineLoadflowParameters(LoadFlowParameters loadFlowP
 
         if (t2wtSplitShuntAdmittance != t3wtSplitShuntAdmittance) {
             throw new PowsyblException(String.format("Unexpected SplitShuntAdmittance configuration %s %s",
-                    t2wtSplitShuntAdmittance, t3wtSplitShuntAdmittance));
+                t2wtSplitShuntAdmittance, t3wtSplitShuntAdmittance));
         }
         boolean twtSplitShuntAdmittance = t2wtSplitShuntAdmittance;
 

cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/FullModel.java

@@ -7,7 +7,6 @@
  */
 package com.powsybl.cgmes.model;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.exceptions.UncheckedXmlStreamException;
@@ -20,6 +19,7 @@
 import java.io.Reader;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.function.Supplier;
 
 /**
  *
@@ -119,7 +119,7 @@ public String toString() {
                 ')';
     }
 
-    private static class ParsingContext {
+    private static final class ParsingContext {
 
         private String id;
 

cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/NamespaceReader.java

@@ -8,7 +8,6 @@
 
 package com.powsybl.cgmes.model;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.powsybl.commons.xml.XmlUtil;
 
@@ -19,6 +18,7 @@
 import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Supplier;
 
 /**
  * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>}

cim-anonymiser/src/main/java/com/powsybl/cim/CimAnonymizer.java

@@ -7,7 +7,6 @@
  */
 package com.powsybl.cim;
 
-import com.google.common.collect.ImmutableSet;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.exceptions.UncheckedXmlStreamException;
 import com.powsybl.commons.util.StringAnonymizer;
@@ -52,9 +51,9 @@ public void logSkipped(Set<String> skipped) {
         }
     }
 
-    private static final Set<String> NAMES_TO_EXCLUDE = ImmutableSet.of("PATL", "TATL");
+    private static final Set<String> NAMES_TO_EXCLUDE = Set.of("PATL", "TATL");
 
-    private static final Set<String> DESCRIPTIONS_TO_EXCLUDE = ImmutableSet.of();
+    private static final Set<String> DESCRIPTIONS_TO_EXCLUDE = Set.of();
 
     private static final String RDF_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 
@@ -64,7 +63,7 @@ public void logSkipped(Set<String> skipped) {
     private static final QName RDF_RESOURCE = new QName(RDF_URI, "resource");
     private static final QName RDF_ABOUT = new QName(RDF_URI, "about");
 
-    private static class XmlStaxContext {
+    private static final class XmlStaxContext {
         private final XMLInputFactory inputFactory = XMLInputFactory.newFactory();
         private final XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
         private final XMLEventFactory eventFactory = XMLEventFactory.newInstance();
@@ -293,7 +292,9 @@ public void anonymizeZip(Path cimZipFile, Path anonymizedCimFileDir, Path dictio
         StringAnonymizer dictionary = loadDic(dictionaryFile);
 
         // anonymize each file of the archive
-        try (ZipFile zipFileData = new ZipFile(Files.newByteChannel(cimZipFile))) {
+        try (ZipFile zipFileData = ZipFile.builder()
+            .setSeekableByteChannel(Files.newByteChannel(cimZipFile))
+            .get()) {
 
             Set<String> rdfIdValues = skipExternalRef ? getRdfIdValues(zipFileData) : null;