Merge remote-tracking branch 'origin/pp/#1343-add-ground-temperature-1m-as-option-to-weather-data' into pp/#1343-add-ground-temperature-1m-as-option-to-weather-data

Author: pierrepetersmeier

CHANGELOG.md

@@ -13,12 +13,14 @@ 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)
+- Fixed the issues with rtd for Cylindrical thermal storage [#1273](https://github.com/ie3-institute/PowerSystemDataModel/issues/1273)
 
 ### Changed
 - Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
 - Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
 - Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
+- Change `TimeSeries` to no longer extend `UniqueEntity` [#1441](https://github.com/ie3-institute/PowerSystemDataModel/issues/1441)
 
 ## [8.1.0] - 2025-07-25
 

build.gradle

@@ -5,11 +5,11 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '7.2.1' //code format
-  id 'com.github.spotbugs' version '6.2.4' // code check, working on byte code
+  id 'com.github.spotbugs' version '6.4.2' // code check, working on byte code
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
-  id "org.sonarqube" version "6.2.0.5505" // sonarqube
+  id "org.sonarqube" version "6.3.1.5724" // sonarqube
   id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
   id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
 }
@@ -92,15 +92,15 @@ dependencies {
   testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.1')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.2')
   implementation 'org.apache.logging.log4j:log4j-api' // log4j
   implementation 'org.apache.logging.log4j:log4j-core' // log4j
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.25'
-  implementation 'com.couchbase.client:java-client:3.9.0'
-  runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
+  implementation 'com.couchbase.client:java-client:3.9.1'
+  runtimeOnly 'org.postgresql:postgresql:42.7.8' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
   implementation 'commons-codec:commons-codec:1.19.0' // needed by commons-compress

docs/readthedocs/models/input/thermal/cylindricalstorage.md

@@ -49,7 +49,7 @@ Model of a cylindrical thermal storage using a fluid to store thermal energy.
      - Temperature of the outlet
 
    * - c
-     - kWh / (K :math:`\cdot` m³)
+     - kWh / (K · m³)
      - Specific heat capacity of the storage medium
      
    * - pThermalMax

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