Merge pull request #1424 from ie3-institute/ms/#1422-add-missing-fields-to-field-validation

Add missing fields to field validation.

Author: danielfeismann

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
 - Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
-
+- Added mising fields to field validation [#1422](https://github.com/ie3-institute/PowerSystemDataModel/issues/1422)
 
 ### Changed
 - Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)

src/main/java/edu/ie3/datamodel/io/factory/input/AbstractThermalStorageInputFactory.java

@@ -6,14 +6,14 @@
 package edu.ie3.datamodel.io.factory.input;
 
 import edu.ie3.datamodel.models.StandardUnits;
-import edu.ie3.datamodel.models.input.AssetInput;
+import edu.ie3.datamodel.models.input.thermal.AbstractStorageInput;
 import edu.ie3.util.quantities.interfaces.SpecificHeatCapacity;
 import javax.measure.quantity.Power;
 import javax.measure.quantity.Temperature;
 import javax.measure.quantity.Volume;
 import tech.units.indriya.ComparableQuantity;
 
-public abstract class AbstractThermalStorageInputFactory<T extends AssetInput>
+public abstract class AbstractThermalStorageInputFactory<T extends AbstractStorageInput>
     extends AssetInputEntityFactory<T, ThermalUnitInputEntityData> {
 
   private static final String STORAGE_VOLUME_LVL = "storageVolumeLvl";

src/main/java/edu/ie3/datamodel/io/factory/input/ConnectorInputEntityFactory.java

@@ -24,6 +24,9 @@ public abstract class ConnectorInputEntityFactory<
         T extends ConnectorInput, D extends ConnectorInputEntityData>
     extends AssetInputEntityFactory<T, D> {
 
+  protected static final String NODE_A = "nodeA";
+  protected static final String NODE_B = "nodeB";
+
   /**
    * Attribute that _can_, but does not _have to_ be present for the creation of {@link
    * ConnectorInput}s. Thus, this attribute name declaration can be used in subclasses of {@link

src/main/java/edu/ie3/datamodel/io/factory/input/LineInputFactory.java

@@ -25,14 +25,17 @@ public class LineInputFactory
   private static final String LENGTH = "length";
   private static final String GEO_POSITION = "geoPosition";
   private static final String OLM_CHARACTERISTIC = "olmCharacteristic";
+  private static final String TYPE = "type";
 
   public LineInputFactory() {
     super(LineInput.class);
   }
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {PARALLEL_DEVICES, LENGTH, GEO_POSITION, OLM_CHARACTERISTIC};
+    return new String[] {
+      NODE_A, NODE_B, PARALLEL_DEVICES, LENGTH, GEO_POSITION, OLM_CHARACTERISTIC, TYPE
+    };
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/input/MeasurementUnitInputFactory.java

@@ -13,6 +13,7 @@
 
 public class MeasurementUnitInputFactory
     extends AssetInputEntityFactory<MeasurementUnitInput, NodeAssetInputEntityData> {
+  private static final String NODE = "node";
   private static final String V_MAG = "vMag";
   private static final String V_ANG = "vAng";
   private static final String P = "p";
@@ -24,7 +25,7 @@ public MeasurementUnitInputFactory() {
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {V_MAG, V_ANG, P, Q};
+    return new String[] {NODE, V_MAG, V_ANG, P, Q};
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/input/SwitchInputFactory.java

@@ -21,7 +21,7 @@ public SwitchInputFactory() {
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {CLOSED};
+    return new String[] {NODE_A, NODE_B, CLOSED};
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactory.java

@@ -25,7 +25,7 @@ public Transformer2WInputFactory() {
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {PARALLEL_DEVICES, TAP_POS, AUTO_TAP};
+    return new String[] {NODE_A, NODE_B, PARALLEL_DEVICES, TAP_POS, AUTO_TAP};
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactory.java

@@ -17,14 +17,15 @@ public class Transformer3WInputFactory
 
   private static final String TAP_POS = "tapPos";
   private static final String AUTO_TAP = "autoTap";
+  private static final String NODE_C = "nodeC";
 
   public Transformer3WInputFactory() {
     super(Transformer3WInput.class);
   }
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {PARALLEL_DEVICES, TAP_POS, AUTO_TAP};
+    return new String[] {NODE_A, NODE_B, NODE_C, PARALLEL_DEVICES, TAP_POS, AUTO_TAP};
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/input/graphics/GraphicInputFactory.java

@@ -26,6 +26,7 @@ public abstract class GraphicInputFactory<T extends GraphicInput, D extends Enti
   private static final String GRAPHIC_LAYER = "graphicLayer";
   private static final String PATH_LINE_STRING = "path";
 
+  @SafeVarargs
   protected GraphicInputFactory(Class<? extends T>... allowedClasses) {
     super(allowedClasses);
   }

src/main/java/edu/ie3/datamodel/io/factory/input/graphics/LineGraphicInputFactory.java

@@ -18,13 +18,15 @@
 public final class LineGraphicInputFactory
     extends GraphicInputFactory<LineGraphicInput, LineGraphicInputEntityData> {
 
+  private static final String LINE = "line";
+
   public LineGraphicInputFactory() {
     super(LineGraphicInput.class);
   }
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[0];
+    return new String[] {LINE};
   }
 
   @Override