ModelConfigs::getModelInfos returns Collection instead of Set

ModelConfigs::getModelsName returns unmodifiableSet Signed-off-by: lisrte <[email protected]>
powsybl · Jul 17, 2024 · b27c5b5 · b27c5b5
1 parent 5f82bf2
commit b27c5b5
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 61 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderConfig.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderConfig.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynamicsimulation.DynamicModel;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 import java.util.function.Supplier;
 
 /**
@@ -26,9 +26,9 @@ public interface ModelBuilderConstructor {
 
     private final String category;
     private final ModelBuilderConstructor builderConstructor;
-    private final Supplier<Set<ModelInfo>> modelInfosSupplier;
+    private final Supplier<Collection<ModelInfo>> modelInfosSupplier;
 
-    public BuilderConfig(String category, ModelBuilderConstructor builderConstructor, Supplier<Set<ModelInfo>> modelInfosSupplier) {
+    public BuilderConfig(String category, ModelBuilderConstructor builderConstructor, Supplier<Collection<ModelInfo>> modelInfosSupplier) {
         this.category = category;
         this.builderConstructor = builderConstructor;
         this.modelInfosSupplier = modelInfosSupplier;
@@ -42,7 +42,7 @@ public ModelBuilderConstructor getBuilderConstructor() {
         return builderConstructor;
     }
 
-    public Set<ModelInfo> getModelInfos() {
+    public Collection<ModelInfo> getModelInfos() {
         return modelInfosSupplier.get();
     }
 }
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java
@@ -10,9 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -43,12 +41,12 @@ public ModelConfig getModelConfig(String modelName) {
         return modelConfigMap.get(modelName);
     }
 
-    public Set<ModelInfo> getModelInfos() {
-        return Set.copyOf(modelConfigMap.values());
+    public Collection<ModelInfo> getModelInfos() {
+        return Collections.unmodifiableCollection(modelConfigMap.values());
     }
 
     Set<String> getModelsName() {
-        return Set.copyOf(modelConfigMap.keySet());
+        return Collections.unmodifiableSet(modelConfigMap.keySet());
     }
 
     void addModelConfigs(ModelConfigs modelConfigsToMerge) {

diff --git a/...ava/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java b/...ava/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java
@@ -14,7 +14,7 @@
 import com.powsybl.iidm.network.Load;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -48,7 +48,7 @@ public static TapChangerAutomationSystemBuilder of(Network network, String model
         return new TapChangerAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java b/...powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java
@@ -50,7 +50,7 @@ public static TapChangerBlockingAutomationSystemBuilder of(Network network, Stri
         return new TapChangerBlockingAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...a/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java b/...a/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java
@@ -13,7 +13,7 @@
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -46,7 +46,7 @@ public static UnderVoltageAutomationSystemBuilder of(Network network, String mod
         return new UnderVoltageAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...z/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java b/...z/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java
@@ -12,7 +12,7 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.TwoSides;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -43,7 +43,7 @@ public static DynamicOverloadManagementSystemBuilder of(Network network, String
         return new DynamicOverloadManagementSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java b/...automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java
@@ -13,7 +13,7 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.TwoSides;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -47,7 +47,7 @@ public static DynamicTwoLevelsOverloadManagementSystemBuilder of(Network network
         return new DynamicTwoLevelsOverloadManagementSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/.../models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java b/.../models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java
@@ -12,7 +12,7 @@
 import com.powsybl.dynawaltz.models.automationsystems.AbstractAutomationSystemModelBuilder;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -43,7 +43,7 @@ public static PhaseShifterBlockingIAutomationSystemBuilder of(Network network, S
         return new PhaseShifterBlockingIAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...ynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java b/...ynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static PhaseShifterIAutomationSystemBuilder of(Network network, String mo
         return new PhaseShifterIAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...ynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java b/...ynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static PhaseShifterPAutomationSystemBuilder of(Network network, String mo
         return new PhaseShifterPAutomationSystemBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static InfiniteBusBuilder of(Network network, String modelName, ReportNod
         return new InfiniteBusBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static StandardBusBuilder of(Network network, String modelName, ReportNod
         return new StandardBusBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...ltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java b/...ltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static GeneratorFictitiousBuilder of(Network network, String modelName, R
         return new GeneratorFictitiousBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...tz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java b/...tz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static GridFormingConverterBuilder of(Network network, String modelName,
         return new GridFormingConverterBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...z/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java b/...z/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static SynchronizedGeneratorBuilder of(Network network, String modelName,
         return new SynchronizedGeneratorBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/...tz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java b/...tz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java
@@ -12,7 +12,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -43,7 +43,7 @@ public static SynchronousGeneratorBuilder of(Network network, String modelName,
         return new SynchronousGeneratorBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static WeccBuilder of(Network network, String modelName, ReportNode repor
         return new WeccBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java
@@ -13,7 +13,7 @@
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -44,7 +44,7 @@ public static HvdcPBuilder of(Network network, String modelName, ReportNode repo
         return new HvdcPBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.*;
 
-import java.util.Set;
+import java.util.Collection;
 import java.util.function.Predicate;
 
 /**
@@ -44,7 +44,7 @@ public static HvdcVscBuilder of(Network network, String modelName, ReportNode re
         return new HvdcVscBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java
@@ -13,7 +13,7 @@
 import com.powsybl.iidm.network.Line;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -44,7 +44,7 @@ public static LineBuilder of(Network network, String modelName, ReportNode repor
         return new LineBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dynawaltz.builders.*;
 import com.powsybl.iidm.network.Network;
 
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -42,7 +42,7 @@ public static BaseLoadBuilder of(Network network, String modelName, ReportNode r
         return new BaseLoadBuilder(network, modelConfig, reportNode);
     }
 
-    public static Set<ModelInfo> getSupportedModelInfos() {
+    public static Collection<ModelInfo> getSupportedModelInfos() {
         return MODEL_CONFIGS.getModelInfos();
     }