Fix code smells

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Apr 21, 2023 · caf4497 · caf4497
1 parent 41e3534
commit caf4497
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzProvider.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzProvider.java
@@ -51,20 +51,17 @@ public class DynaWaltzProvider implements DynamicSimulationProvider {
     private static final String WORKING_DIR_PREFIX = "powsybl_dynawaltz_";
     private static final String OUTPUT_IIDM_FILENAME = "outputIIDM.xml";
 
-    private final PlatformConfig platformConfig;
-
     private final DynaWaltzConfig dynaWaltzConfig;
 
     public DynaWaltzProvider() {
         this(PlatformConfig.defaultConfig());
     }
 
     public DynaWaltzProvider(PlatformConfig platformConfig) {
-        this(platformConfig, DynaWaltzConfig.load(platformConfig));
+        this(DynaWaltzConfig.load(platformConfig));
     }
 
-    public DynaWaltzProvider(PlatformConfig platformConfig, DynaWaltzConfig dynawoConfig) {
-        this.platformConfig = Objects.requireNonNull(platformConfig);
+    public DynaWaltzProvider(DynaWaltzConfig dynawoConfig) {
         this.dynaWaltzConfig = Objects.requireNonNull(dynawoConfig);
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/ParametersXml.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/ParametersXml.java
@@ -34,6 +34,8 @@
  */
 public final class ParametersXml {
 
+    public static final String PARAMETERS_SET_ELEMENT_NAME = "parametersSet";
+
     private ParametersXml() {
     }
 
@@ -80,10 +82,9 @@ public static ParametersSet load(Path parametersFile, String parameterSetId) {
     private static List<ParametersSet> readAndClose(XMLStreamReader xmlReader) throws XMLStreamException {
         List<ParametersSet> parametersSets = new ArrayList<>();
         skipComments(xmlReader);
-        com.powsybl.commons.xml.XmlUtil.readUntilEndElement("parametersSet", xmlReader, () -> {
+        com.powsybl.commons.xml.XmlUtil.readUntilEndElement(PARAMETERS_SET_ELEMENT_NAME, xmlReader, () -> {
             if (!xmlReader.getLocalName().equals("set")) {
-                xmlReader.close();
-                throw new PowsyblException("Unexpected element: " + xmlReader.getLocalName());
+                closeAndThrowException(xmlReader, xmlReader.getLocalName());
             }
             String parameterSetIdRead = xmlReader.getAttributeValue(null, "id");
             ParametersSet parametersSet = new ParametersSet(parameterSetIdRead);
@@ -98,13 +99,12 @@ private static ParametersSet readOneSetAndClose(XMLStreamReader xmlReader, Strin
         ParametersSet parametersSet = new ParametersSet(parameterSetId);
         AtomicBoolean found = new AtomicBoolean(false);
         skipComments(xmlReader);
-        com.powsybl.commons.xml.XmlUtil.readUntilEndElement("parametersSet", xmlReader, () -> {
+        com.powsybl.commons.xml.XmlUtil.readUntilEndElement(PARAMETERS_SET_ELEMENT_NAME, xmlReader, () -> {
             if (found.get()) {
                 return;
             }
             if (!xmlReader.getLocalName().equals("set")) {
-                xmlReader.close();
-                throw new PowsyblException("Unexpected element: " + xmlReader.getLocalName());
+                closeAndThrowException(xmlReader, xmlReader.getLocalName());
             }
             if (xmlReader.getAttributeValue(null, "id").equals(parameterSetId)) {
                 fillParametersSet(xmlReader, parametersSet);
@@ -130,7 +130,7 @@ private static void fillParametersSet(XMLStreamReader xmlReader, ParametersSet p
                 String origName = xmlReader.getAttributeValue(null, "origName");
                 parametersSet.addReference(name, type, origData, origName);
             } else {
-                throw new PowsyblException("Unexpected element: " + xmlReader.getLocalName());
+                closeAndThrowException(xmlReader, xmlReader.getLocalName());
             }
         });
     }
@@ -149,6 +149,11 @@ private static void skipComments(XMLStreamReader xmlReader) throws XMLStreamExce
         }
     }
 
+    private static void closeAndThrowException(XMLStreamReader xmlReader, String unexpectedElement) throws XMLStreamException {
+        xmlReader.close();
+        throw new PowsyblException("Unexpected element: " + unexpectedElement);
+    }
+
     public static void write(Path workingDir, DynaWaltzContext context) throws IOException, XMLStreamException {
         Objects.requireNonNull(workingDir);
 
@@ -159,7 +164,7 @@ public static void write(Path workingDir, DynaWaltzContext context) throws IOExc
 
         // Write parameterSet that needs to be generated (OmegaRef...)
         Path file = workingDir.resolve(context.getSimulationParFile());
-        XmlUtil.write(file, context, "parametersSet", ParametersXml::write);
+        XmlUtil.write(file, context, PARAMETERS_SET_ELEMENT_NAME, ParametersXml::write);
     }
 
     private static void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException {
@@ -175,7 +180,7 @@ private static void write(Collection<ParametersSet> parametersSets, String filen
             try {
                 xmlWriter.writeStartDocument(StandardCharsets.UTF_8.toString(), "1.0");
                 xmlWriter.setPrefix("", DYN_URI);
-                xmlWriter.writeStartElement(DYN_URI, "parametersSet");
+                xmlWriter.writeStartElement(DYN_URI, PARAMETERS_SET_ELEMENT_NAME);
                 xmlWriter.writeNamespace("", DYN_URI);
                 for (ParametersSet parametersSet : parametersSets) {
                     writeParametersSet(xmlWriter, parametersSet);

diff --git a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java
@@ -6,7 +6,6 @@
  */
 package com.powsybl.dynawo.it;
 
-import com.powsybl.commons.config.PlatformConfig;
 import com.powsybl.commons.datasource.ResourceDataSource;
 import com.powsybl.commons.datasource.ResourceSet;
 import com.powsybl.dynamicsimulation.*;
@@ -43,7 +42,7 @@ class DynaWaltzTest extends AbstractDynawoTest {
     @BeforeEach
     void setUp() throws Exception {
         super.setUp();
-        provider = new DynaWaltzProvider(PlatformConfig.defaultConfig(), new DynaWaltzConfig("/dynawo", false));
+        provider = new DynaWaltzProvider(new DynaWaltzConfig("/dynawo", false));
         parameters = new DynamicSimulationParameters()
                 .setStartTime(1)
                 .setStopTime(100);