Review fixes

Signed-off-by: Florian Dupuy <[email protected]>

dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java

@@ -85,9 +85,14 @@ public DynaWaltzContext(Network network, String workingVariantId, List<BlackBoxM
 
         this.eventModels = Objects.requireNonNull(eventModels).stream()
                 .filter(distinctByDynamicId(contextReporter))
-                .map(setLateInitEventField())
                 .toList();
 
+        // Late init on ContextDependentEvents
+        this.eventModels.stream()
+                .filter(ContextDependentEvent.class::isInstance)
+                .map(ContextDependentEvent.class::cast)
+                .forEach(e -> e.setEquipmentHasDynamicModel(this));
+
         this.curves = Objects.requireNonNull(curves);
         this.parameters = Objects.requireNonNull(parameters);
         this.dynaWaltzParameters = Objects.requireNonNull(dynaWaltzParameters);
@@ -201,15 +206,6 @@ protected static Predicate<BlackBoxModel> distinctByDynamicId(Reporter reporter)
         };
     }
 
-    protected Function<BlackBoxModel, BlackBoxModel> setLateInitEventField() {
-        return blackBoxModel -> {
-            if (blackBoxModel instanceof ContextDependentEvent event) {
-                event.setEquipmentHasDynamicModel(this);
-            }
-            return blackBoxModel;
-        };
-    }
-
     public boolean hasDynamicModel(Identifiable<?> equipment) {
         return staticIdBlackBoxModelMap.containsKey(equipment.getId());
     }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultEquipmentConnectionPoint.java

@@ -27,7 +27,7 @@ public final class DefaultEquipmentConnectionPoint implements EquipmentConnectio
     private DefaultEquipmentConnectionPoint() {
     }
 
-    public static DefaultEquipmentConnectionPoint getDefaultModel(String staticId) {
+    public static DefaultEquipmentConnectionPoint getDefaultModel() {
         return INSTANCE;
     }
 

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java

@@ -35,7 +35,7 @@ public enum DefaultModelConfiguration {
             new DefaultModelFactory<>(DefaultActionConnectionPoint::new)),
     EQUIPMENT_CONNECTION_POINT(IdentifiableType.BUS,
             EquipmentConnectionPoint.class,
-            DefaultEquipmentConnectionPoint::getDefaultModel),
+            staticId -> DefaultEquipmentConnectionPoint.getDefaultModel()),
     GENERATOR(IdentifiableType.GENERATOR,
             GeneratorModel.class,
             new DefaultModelFactory<>(DefaultGenerator::new)),

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactoryInterface.java

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
 package com.powsybl.dynawaltz.models.defaultmodels;
 
 /**

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizedModel.java

@@ -42,5 +42,5 @@ default double getWeightGen(DynaWaltzParameters dynaWaltzParameters) {
 
     String getStaticId();
 
-    Bus getConnectesBus();
+    Bus getConnectableBus();
 }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java

@@ -72,7 +72,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) throws PowsyblEx
         for (FrequencySynchronizedModel eq : synchronizedEquipments) {
             adder.createMacroConnections(this, eq, getVarConnectionsWith(eq), MacroConnectAttribute.ofIndex1(index));
             // If a bus with a dynamic model is found SetPoint is used in place of OmegaRef, thus at this point we don't have to handle dynamic model buses
-            BusOfFrequencySynchronizedModel busOf = new DefaultBusOfFrequencySynchronized(eq.getConnectesBus().getId(), eq.getStaticId());
+            BusOfFrequencySynchronizedModel busOf = new DefaultBusOfFrequencySynchronized(eq.getConnectableBus().getId(), eq.getStaticId());
             adder.createMacroConnections(this, busOf, getVarConnectionsWithBus(busOf), MacroConnectAttribute.ofIndex1(index));
             index++;
         }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverter.java

@@ -78,7 +78,7 @@ public List<VarMapping> getVarsMapping() {
     }
 
     @Override
-    public Bus getConnectesBus() {
+    public Bus getConnectableBus() {
         return BusUtils.getConnectableBus(equipment);
     }
 }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGenerator.java

@@ -46,7 +46,7 @@ public String getOmegaRefPuVarName() {
     }
 
     @Override
-    public Bus getConnectesBus() {
+    public Bus getConnectableBus() {
         return BusUtils.getConnectableBus(equipment);
     }
 }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedWeccGen.java

@@ -32,7 +32,7 @@ public String getRunningVarName() {
     }
 
     @Override
-    public Bus getConnectesBus() {
+    public Bus getConnectableBus() {
         return BusUtils.getConnectableBus(equipment);
     }
 }

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/LateInitField.java

@@ -26,6 +26,9 @@ public final T getValue() {
     }
 
     public final void setValue(T value) {
+        if (this.value != null) {
+            throw new PowsyblException("Field has already been initialized");
+        }
         this.value = Objects.requireNonNull(value);
     }
 }