Merge branch 'dev' into df/#1352-air-condition-input

Author: danielfeismann

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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

@@ -4,7 +4,7 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '7.2.1' //code format
+  id 'com.diffplug.spotless' version '8.0.0' //code format
   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
@@ -92,7 +92,7 @@ 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

src/main/java/edu/ie3/datamodel/io/factory/timeseries/BdewLoadProfileFactory.java

@@ -76,8 +76,7 @@ public BdewLoadProfileTimeSeries build(
     ComparableQuantity<Power> maxPower = calculateMaxPower(profile, entries);
     ComparableQuantity<Energy> profileEnergyScaling = getLoadProfileEnergyScaling(profile);
 
-    return new BdewLoadProfileTimeSeries(
-        metaInformation.getUuid(), profile, entries, maxPower, profileEnergyScaling);
+    return new BdewLoadProfileTimeSeries(profile, entries, maxPower, profileEnergyScaling);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/factory/timeseries/LoadProfileFactory.java

@@ -24,7 +24,7 @@
  * @param <P> type of load profile
  * @param <V> type of load values
  */
-public abstract class LoadProfileFactory<P extends LoadProfile, V extends LoadValues>
+public abstract class LoadProfileFactory<P extends LoadProfile, V extends LoadValues<P>>
     extends Factory<V, LoadProfileData<V>, LoadProfileEntry<V>> {
   protected static final String QUARTER_HOUR = "quarterHour";
 
@@ -37,7 +37,7 @@ protected LoadProfileFactory(Class<? extends V>... valueClass) {
     super(valueClass);
   }
 
-  public abstract LoadProfileTimeSeries<V> build(
+  public abstract LoadProfileTimeSeries<P, V> build(
       LoadProfileMetaInformation metaInformation, Set<LoadProfileEntry<V>> entries);
 
   public abstract P parseProfile(String profile);

src/main/java/edu/ie3/datamodel/io/factory/timeseries/RandomLoadProfileFactory.java

@@ -79,8 +79,7 @@ public RandomLoadProfileTimeSeries build(
     ComparableQuantity<Power> maxPower = calculateMaxPower(profile, entries);
     ComparableQuantity<Energy> profileEnergyScaling = getLoadProfileEnergyScaling(profile);
 
-    return new RandomLoadProfileTimeSeries(
-        metaInformation.getUuid(), profile, entries, maxPower, profileEnergyScaling);
+    return new RandomLoadProfileTimeSeries(profile, entries, maxPower, profileEnergyScaling);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/naming/DatabaseNamingStrategy.java

@@ -97,7 +97,7 @@ Optional<String> getEntityName(T timeSeries) {
         logger.error("Unable to determine content of time series {}", timeSeries);
         return Optional.empty();
       }
-    } else if (timeSeries instanceof LoadProfileTimeSeries<?>) {
+    } else if (timeSeries instanceof LoadProfileTimeSeries<?, ?>) {
       return Optional.of(getLoadProfileEntityName());
     } else {
       logger.error("There is no naming strategy defined for {}", timeSeries);

src/main/java/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategy.java

@@ -349,7 +349,7 @@ public Optional<String> getTimeSeriesMappingEntityName() {
           V extends Value,
           R extends Value>
       Optional<String> getEntityName(T timeSeries) {
-    if (timeSeries instanceof IndividualTimeSeries) {
+    if (timeSeries instanceof IndividualTimeSeries<?> its) {
       Optional<E> maybeFirstElement = timeSeries.getEntries().stream().findFirst();
       if (maybeFirstElement.isPresent()) {
         Class<? extends Value> valueClass = maybeFirstElement.get().getValue().getClass();
@@ -361,17 +361,17 @@ Optional<String> getEntityName(T timeSeries) {
                   .concat("_")
                   .concat(mayBeColumnScheme.get().getScheme())
                   .concat("_")
-                  .concat(timeSeries.getUuid().toString())
+                  .concat(its.getUuid().toString())
                   .concat(suffix));
         } else {
-          logger.error("Unsupported content of time series {}", timeSeries);
+          logger.error("Unsupported content of time series {}", its);
           return Optional.empty();
         }
       } else {
         logger.error("Unable to determine content of time series {}", timeSeries);
         return Optional.empty();
       }
-    } else if (timeSeries instanceof LoadProfileTimeSeries<?> loadProfileTimeSeries) {
+    } else if (timeSeries instanceof LoadProfileTimeSeries<?, ?> loadProfileTimeSeries) {
       return Optional.of(
           prefix
               .concat("lpts")

src/main/java/edu/ie3/datamodel/io/naming/TimeSeriesMetaInformation.java

@@ -5,13 +5,37 @@
 */
 package edu.ie3.datamodel.io.naming;
 
-import edu.ie3.datamodel.models.input.UniqueInputEntity;
+import edu.ie3.datamodel.models.Entity;
+import edu.ie3.datamodel.models.Uniqueness;
+import java.util.Objects;
 import java.util.UUID;
 
 /** Meta information, that describe a certain data source */
-public abstract class TimeSeriesMetaInformation extends UniqueInputEntity {
+public abstract class TimeSeriesMetaInformation implements Entity, Uniqueness {
+  private final UUID uuid;
 
   protected TimeSeriesMetaInformation(UUID uuid) {
-    super(uuid);
+    this.uuid = uuid;
+  }
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+    TimeSeriesMetaInformation that = (TimeSeriesMetaInformation) o;
+    return Objects.equals(uuid, that.uuid);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(uuid);
+  }
+
+  @Override
+  public String toString() {
+    return "TimeSeriesMetaInformation{" + "uuid=" + uuid + '}';
   }
 }

src/main/java/edu/ie3/datamodel/io/sink/SqlSink.java

@@ -251,7 +251,7 @@ private <E extends TimeSeriesEntry<V>, V extends Value, R extends Value> void pe
       TriFunction<String, String, String[], String> queryBuilder;
       String timeSeriesIdentifier;
 
-      if (timeSeries instanceof LoadProfileTimeSeries<?> lpts) {
+      if (timeSeries instanceof LoadProfileTimeSeries<?, ?> lpts) {
         timeSeriesIdentifier = lpts.getLoadProfile().getKey();
         queryBuilder = this::basicInsertQueryValuesLPTS;
       } else {

src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java

@@ -60,7 +60,7 @@ protected Try<LoadProfileEntry<V>, FactoryException> createEntries(
     return entryFactory.get(factoryData);
   }
 
-  public abstract LoadProfileTimeSeries<V> getTimeSeries();
+  public abstract LoadProfileTimeSeries<P, V> getTimeSeries();
 
   /**
    * Method to return all time keys after a given timestamp.