Remove marker interfaces (#352)

Signed-off-by: lisrte <[email protected]>
powsybl · May 23, 2024 · ec9c4be · ec9c4be
1 parent 81ae3a2
commit ec9c4be
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 47 deletions.
diff --git a/...c/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractInjectionDefaultModel.java b/...c/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractInjectionDefaultModel.java
@@ -7,10 +7,12 @@
  */
 package com.powsybl.dynawaltz.models.defaultmodels;
 
+import com.powsybl.dynawaltz.models.InjectionModel;
+
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public abstract class AbstractInjectionDefaultModel extends AbstractDefaultModel {
+public abstract class AbstractInjectionDefaultModel extends AbstractDefaultModel implements InjectionModel {
 
     protected AbstractInjectionDefaultModel(String staticId) {
         super(staticId);
@@ -20,6 +22,7 @@ public String getStateValueVarName() {
         return "@NAME@_state_value";
     }
 
+    @Override
     public String getSwitchOffSignalEventVarName() {
         return getStateValueVarName();
     }

diff --git a/...z/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java b/...z/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java
@@ -7,6 +7,7 @@
  */
 package com.powsybl.dynawaltz.models.defaultmodels;
 
+import com.powsybl.dynawaltz.models.InjectionModel;
 import com.powsybl.dynawaltz.models.Model;
 import com.powsybl.dynawaltz.models.buses.*;
 import com.powsybl.dynawaltz.models.generators.DefaultGenerator;
@@ -16,11 +17,9 @@
 import com.powsybl.dynawaltz.models.lines.DefaultLine;
 import com.powsybl.dynawaltz.models.lines.LineModel;
 import com.powsybl.dynawaltz.models.loads.DefaultLoad;
-import com.powsybl.dynawaltz.models.loads.LoadModel;
 import com.powsybl.dynawaltz.models.shunts.DefaultShunt;
 import com.powsybl.dynawaltz.models.shunts.ShuntModel;
 import com.powsybl.dynawaltz.models.svarcs.DefaultStaticVarCompensator;
-import com.powsybl.dynawaltz.models.svarcs.StaticVarCompensatorModel;
 import com.powsybl.dynawaltz.models.transformers.DefaultTransformer;
 import com.powsybl.dynawaltz.models.transformers.TransformerModel;
 import com.powsybl.iidm.network.IdentifiableType;
@@ -49,13 +48,13 @@ public enum DefaultModelConfiguration {
             LineModel.class,
             new DefaultModelFactory<>(DefaultLine::new)),
     LOAD(IdentifiableType.LOAD,
-            LoadModel.class,
+            InjectionModel.class,
             new DefaultModelFactory<>(DefaultLoad::new)),
     SHUNT_COMPENSATOR(IdentifiableType.SHUNT_COMPENSATOR,
             ShuntModel.class,
             new DefaultModelFactory<>(DefaultShunt::new)),
     STATIC_VAR_COMPENSATOR(IdentifiableType.STATIC_VAR_COMPENSATOR,
-            StaticVarCompensatorModel.class,
+            InjectionModel.class,
             new DefaultModelFactory<>(DefaultStaticVarCompensator::new)),
     TWO_WINDINGS_TRANSFORMER(IdentifiableType.TWO_WINDINGS_TRANSFORMER,
             TransformerModel.class,

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java
@@ -7,6 +7,7 @@
 package com.powsybl.dynawaltz.models.loads;
 
 import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel;
+import com.powsybl.dynawaltz.models.InjectionModel;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint;
 import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder;
@@ -18,7 +19,7 @@
  * @author Marcos de Miguel {@literal <demiguelm at aia.es>}
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public abstract class AbstractLoad extends AbstractEquipmentBlackBoxModel<Load> implements LoadModel {
+public abstract class AbstractLoad extends AbstractEquipmentBlackBoxModel<Load> implements InjectionModel {
 
     protected final String terminalVarName;
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/DefaultLoad.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/DefaultLoad.java
@@ -13,7 +13,7 @@
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public class DefaultLoad extends AbstractInjectionDefaultModel implements LoadModel, ControllableEquipment {
+public class DefaultLoad extends AbstractInjectionDefaultModel implements ControllableEquipment {
 
     public DefaultLoad(String staticId) {
         super(staticId);

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadModel.java
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensator.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensator.java
@@ -8,18 +8,20 @@
 package com.powsybl.dynawaltz.models.svarcs;
 
 import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel;
+import com.powsybl.dynawaltz.models.InjectionModel;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.VarMapping;
 import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint;
 import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder;
+import com.powsybl.iidm.network.StaticVarCompensator;
 import com.powsybl.iidm.network.extensions.StandbyAutomaton;
 
 import java.util.List;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public class BaseStaticVarCompensator extends AbstractEquipmentBlackBoxModel<com.powsybl.iidm.network.StaticVarCompensator> implements StaticVarCompensatorModel {
+public class BaseStaticVarCompensator extends AbstractEquipmentBlackBoxModel<StaticVarCompensator> implements InjectionModel {
 
     private static final VarMapping P_MAPPING = new VarMapping("SVarC_injector_PInjPu", "p");
     private static final VarMapping Q_MAPPING = new VarMapping("SVarC_injector_QInjPu", "q");
@@ -29,7 +31,7 @@ public class BaseStaticVarCompensator extends AbstractEquipmentBlackBoxModel<com
     private static final List<VarMapping> VAR_MAPPING_NO_STANDBY_AUTOMATON = List.of(P_MAPPING, Q_MAPPING, STATE_MAPPING);
     private static final List<VarMapping> VAR_MAPPING_WITH_STANDBY_AUTOMATON = List.of(P_MAPPING, Q_MAPPING, STATE_MAPPING, MODE_MAPPING);
 
-    protected BaseStaticVarCompensator(String dynamicModelId, com.powsybl.iidm.network.StaticVarCompensator svarc, String parameterSetId, String lib) {
+    protected BaseStaticVarCompensator(String dynamicModelId, StaticVarCompensator svarc, String parameterSetId, String lib) {
         super(dynamicModelId, parameterSetId, svarc, lib);
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/DefaultStaticVarCompensator.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/DefaultStaticVarCompensator.java
@@ -12,7 +12,7 @@
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public class DefaultStaticVarCompensator extends AbstractInjectionDefaultModel implements StaticVarCompensatorModel {
+public class DefaultStaticVarCompensator extends AbstractInjectionDefaultModel {
 
     public DefaultStaticVarCompensator(String staticId) {
         super(staticId);

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/StaticVarCompensatorModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/StaticVarCompensatorModel.java
diff --git a/...ltz/src/test/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelHandlerTest.java b/...ltz/src/test/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelHandlerTest.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.models.Model;
 import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint;
 import com.powsybl.dynawaltz.models.generators.GeneratorModel;
-import com.powsybl.dynawaltz.models.loads.LoadModel;
+import com.powsybl.dynawaltz.models.shunts.ShuntModel;
 import com.powsybl.iidm.network.Bus;
 import com.powsybl.iidm.network.Generator;
 import com.powsybl.iidm.network.Network;
@@ -46,28 +46,28 @@ void getMultipleConfigDefaultModel() {
     @Test
     void noInterfaceImplementationLog() {
         Generator gen = network.getGenerator("GEN");
-        Model model = defaultModelHandler.getDefaultModel(gen, LoadModel.class, false);
+        Model model = defaultModelHandler.getDefaultModel(gen, ShuntModel.class, false);
         assertNull(model);
     }
 
     @Test
     void noInterfaceImplementationException() {
         Generator gen = network.getGenerator("GEN");
-        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(gen, LoadModel.class, true));
-        assertEquals("Default model DefaultGenerator for GEN does not implement LoadModel interface", pe.getMessage());
+        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(gen, ShuntModel.class, true));
+        assertEquals("Default model DefaultGenerator for GEN does not implement ShuntModel interface", pe.getMessage());
     }
 
     @Test
     void noDynamicModelException() {
         VoltageLevel vl = network.getVoltageLevel("VLGEN");
-        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(vl, LoadModel.class, true));
+        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(vl, ShuntModel.class, true));
         assertEquals("No default model configuration for VOLTAGE_LEVEL", pe.getMessage());
     }
 
     @Test
     void noMultipleDynamicModelException() {
         Bus bus = network.getBusBreakerView().getBus("NGEN");
-        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(bus, LoadModel.class, true));
-        assertEquals("No default model configuration for BUS - LoadModel", pe.getMessage());
+        PowsyblException pe = assertThrows(PowsyblException.class, () -> defaultModelHandler.getDefaultModel(bus, ShuntModel.class, true));
+        assertEquals("No default model configuration for BUS - ShuntModel", pe.getMessage());
     }
 }