Merge branch 'dev' into ms/#1438-abstracting-power-value-sources

# Conflicts:
#	src/main/java/edu/ie3/datamodel/io/factory/timeseries/LoadProfileFactory.java
#	src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java
#	src/main/java/edu/ie3/datamodel/io/source/csv/CsvLoadProfileSource.java
#	src/main/java/edu/ie3/datamodel/io/source/sql/SqlLoadProfileSource.java
#	src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileTimeSeries.java
#	src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/RandomLoadProfileTimeSeries.java
#	src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlLoadProfileSourceIT.groovy

Author: staudtMarius

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
 

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,10 +361,10 @@ 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 {

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/source/sql/SqlLoadProfileSource.java

@@ -106,7 +106,7 @@ public Optional<PValue> getValue(TimeSeriesInputValue data) {
         getEntries(queryTime, ps -> ps.setInt(1, TimeSeriesUtils.calculateQuarterHourOfDay(time)));
     if (entries.isEmpty()) return Optional.empty();
     if (entries.size() > 1) log.warn("Retrieved more than one result value, using the first");
-    return Optional.of(entries.stream().toList().getFirst().getValue().getValue(time, profile));
+    return entries.stream().findFirst().map(entry -> entry.getValue().getValue(time, loadProfile));
   }
 
   @Override

src/main/java/edu/ie3/datamodel/models/UniqueEntity.java

@@ -10,7 +10,7 @@
 import java.util.UUID;
 
 /** Supplies every subclass with a generated UUID, making it unique */
-public abstract class UniqueEntity implements Entity, Serializable {
+public abstract class UniqueEntity implements Entity, Uniqueness, Serializable {
   /** Field name of {@link UniqueEntity} uuid */
   public static final String UUID_FIELD_NAME = "uuid";
 
@@ -24,6 +24,7 @@ protected UniqueEntity(UUID uuid) {
     this.uuid = uuid == null ? UUID.randomUUID() : uuid;
   }
 
+  @Override
   public UUID getUuid() {
     return uuid;
   }

src/main/java/edu/ie3/datamodel/models/Uniqueness.java

@@ -0,0 +1,13 @@
+/*
+ * © 2025. TU Dortmund University,
+ * Institute of Energy Systems, Energy Efficiency and Energy Economics,
+ * Research group Distribution grid planning and operation
+*/
+package edu.ie3.datamodel.models;
+
+import java.util.UUID;
+
+public interface Uniqueness {
+
+  UUID getUuid();
+}

src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeries.java

@@ -5,7 +5,8 @@
 */
 package edu.ie3.datamodel.models.timeseries;
 
-import edu.ie3.datamodel.models.UniqueEntity;
+import edu.ie3.datamodel.models.Entity;
+import edu.ie3.datamodel.models.Uniqueness;
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.Value;
 import java.time.ZonedDateTime;
@@ -19,18 +20,24 @@
  * @param <R> Type of the value, the time series will return
  */
 public abstract class TimeSeries<E extends TimeSeriesEntry<V>, V extends Value, R extends Value>
-    extends UniqueEntity {
+    implements Entity, Uniqueness {
+  private final UUID uuid;
   private final Set<E> entries;
 
   protected TimeSeries(Set<E> entries) {
-    this.entries = Collections.unmodifiableSet(entries);
+    this(UUID.randomUUID(), entries);
   }
 
   protected TimeSeries(UUID uuid, Set<E> entries) {
-    super(uuid);
+    this.uuid = uuid;
     this.entries = Collections.unmodifiableSet(entries);
   }
 
+  @Override
+  public UUID getUuid() {
+    return uuid;
+  }
+
   /**
    * Get the time based value for the queried time
    *
@@ -117,6 +124,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "TimeSeries{" + "uuid=" + getUuid() + ", #entries=" + entries.size() + '}';
+    return "TimeSeries{" + "#entries=" + entries.size() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/BdewLoadProfileTimeSeries.java

@@ -43,8 +43,6 @@ public int hashCode() {
   @Override
   public String toString() {
     return "BDEWLoadProfileTimeSeries{"
-        + "uuid="
-        + getUuid()
         + "loadProfile="
         + getLoadProfile()
         + ", valueMapping="

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileTimeSeries.java

@@ -38,7 +38,7 @@ public LoadProfileTimeSeries(
       Set<LoadProfileEntry<V>> entries,
       ComparableQuantity<Power> maxPower,
       ComparableQuantity<Energy> profileEnergyScaling) {
-    super(UUID.randomUUID(), entries);
+    super(entries);
     this.loadProfile = loadProfile;
     this.valueMapping =
         entries.stream()
@@ -114,8 +114,6 @@ public int hashCode() {
   @Override
   public String toString() {
     return "LoadProfileTimeSeries{"
-        + "uuid="
-        + getUuid()
         + "loadProfile="
         + getLoadProfile()
         + ", valueMapping="

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/RandomLoadProfileTimeSeries.java

@@ -28,11 +28,6 @@ public RandomLoadProfileTimeSeries(
     super(loadProfile, entries, maxPower, profileEnergyScaling);
   }
 
-  @Override
-  public LoadProfile.RandomLoadProfile getLoadProfile() {
-    return super.getLoadProfile();
-  }
-
   @Override
   public String toString() {
     return "Random" + super.toString();