Prefix overload management adders with dynamic

Fix checkstyle Signed-off-by: lisrte <[email protected]>
powsybl · Aug 2, 2024 · d3f40cc · d3f40cc
1 parent 0646c63
commit d3f40cc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/java/src/main/java/com/powsybl/dataframe/dynamic/adders/ActivePowerVariationAdder.java b/java/src/main/java/com/powsybl/dataframe/dynamic/adders/ActivePowerVariationAdder.java
@@ -10,7 +10,6 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.dataframe.SeriesMetadata;
 import com.powsybl.dataframe.update.DoubleSeries;
-import com.powsybl.dataframe.update.IntSeries;
 import com.powsybl.dataframe.update.StringSeries;
 import com.powsybl.dataframe.update.UpdatingDataframe;
 import com.powsybl.dynawaltz.models.events.EventActivePowerVariationBuilder;

diff --git a/java/src/main/java/com/powsybl/dataframe/dynamic/adders/DynamicMappingHandler.java b/java/src/main/java/com/powsybl/dataframe/dynamic/adders/DynamicMappingHandler.java
@@ -40,8 +40,8 @@ public final class DynamicMappingHandler {
             Map.entry(DynamicMappingType.BASE_BUS, new BaseBusAdder()),
             Map.entry(DynamicMappingType.INFINITE_BUS, new InfiniteBusAdder()),
             // Automation systems
-            Map.entry(DynamicMappingType.OVERLOAD_MANAGEMENT_SYSTEM, new OverloadManagementSystemAdder()),
-            Map.entry(DynamicMappingType.TWO_LEVELS_OVERLOAD_MANAGEMENT_SYSTEM, new TwoLevelsOverloadManagementSystemAdder()),
+            Map.entry(DynamicMappingType.OVERLOAD_MANAGEMENT_SYSTEM, new DynamicOverloadManagementSystemAdder()),
+            Map.entry(DynamicMappingType.TWO_LEVELS_OVERLOAD_MANAGEMENT_SYSTEM, new DynamicTwoLevelsOverloadManagementSystemAdder()),
             Map.entry(DynamicMappingType.PHASE_SHIFTER_I, new PhaseShifterIAdder()),
             Map.entry(DynamicMappingType.PHASE_SHIFTER_P, new PhaseShifterPAdder()),
             Map.entry(DynamicMappingType.UNDER_VOLTAGE, new UnderVoltageAutomationSystemAdder()),

diff --git a/...adders/OverloadManagementSystemAdder.java → ...DynamicOverloadManagementSystemAdder.java b/...adders/OverloadManagementSystemAdder.java → ...DynamicOverloadManagementSystemAdder.java
@@ -13,7 +13,6 @@
 import com.powsybl.dataframe.update.UpdatingDataframe;
 import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder;
 import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.TwoSides;
 import com.powsybl.python.commons.PyPowsyblApiHeader.ThreeSideType;
 import com.powsybl.python.commons.Util;
 
@@ -25,7 +24,7 @@
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public class OverloadManagementSystemAdder extends AbstractDynamicModelAdder {
+public class DynamicOverloadManagementSystemAdder extends AbstractDynamicModelAdder {
 
     protected static final List<SeriesMetadata> METADATA = List.of(
             SeriesMetadata.stringIndex(DYNAMIC_MODEL_ID),

diff --git a/...oLevelsOverloadManagementSystemAdder.java → ...oLevelsOverloadManagementSystemAdder.java b/...oLevelsOverloadManagementSystemAdder.java → ...oLevelsOverloadManagementSystemAdder.java
@@ -24,7 +24,7 @@
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-public class TwoLevelsOverloadManagementSystemAdder extends AbstractDynamicModelAdder {
+public class DynamicTwoLevelsOverloadManagementSystemAdder extends AbstractDynamicModelAdder {
 
     protected static final List<SeriesMetadata> METADATA = List.of(
             SeriesMetadata.stringIndex(DYNAMIC_MODEL_ID),

diff --git a/java/src/main/java/com/powsybl/dataframe/dynamic/adders/NodeFaultAdder.java b/java/src/main/java/com/powsybl/dataframe/dynamic/adders/NodeFaultAdder.java
@@ -10,7 +10,6 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.dataframe.SeriesMetadata;
 import com.powsybl.dataframe.update.DoubleSeries;
-import com.powsybl.dataframe.update.IntSeries;
 import com.powsybl.dataframe.update.StringSeries;
 import com.powsybl.dataframe.update.UpdatingDataframe;
 import com.powsybl.dynawaltz.models.events.NodeFaultEventBuilder;

diff --git a/java/src/main/java/com/powsybl/dataframe/network/adders/SeriesUtils.java b/java/src/main/java/com/powsybl/dataframe/network/adders/SeriesUtils.java
@@ -62,10 +62,10 @@ public static <E extends Enum<E>> void applyIfPresent(StringSeries series, int i
     }
 
     public static <E extends Enum<E>, F extends Enum<F>> void applyIfPresent(StringSeries series, int index, Class<E> pythonEnumClass,
-                                                                             Function<E,F> converter, Consumer<F> consumer) {
+                                                                             Function<E, F> converter, Consumer<F> consumer) {
         if (series != null) {
             F convertedEnum = converter.apply(Enum.valueOf(pythonEnumClass, series.get(index)));
-            if(convertedEnum != null) {
+            if (convertedEnum != null) {
                 consumer.accept(convertedEnum);
             }
         }