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

Author: pierrepetersmeier

CHANGELOG.md

@@ -7,15 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
+- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
 - Add ground temperature (1m) as  option to weather data. [#1343](https://github.com/ie3-institute/PowerSystemDataModel/issues/1343)
 
 ### Fixed
 - Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
-- -Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
+- Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
+- Fixed valid fields for `EmInput` [#1360](https://github.com/ie3-institute/PowerSystemDataModel/issues/1360)
 
 ### Changed
 - Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
 - Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
+- Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
 
 ## [7.0.0] - 2025-05-08
 

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.0.4' //code format
+  id 'com.diffplug.spotless' version '7.1.0' //code format
   id 'com.github.spotbugs' version '6.2.1' // code check, working on byte code
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation

src/main/java/edu/ie3/datamodel/exceptions/DuplicateEntitiesException.java

@@ -19,7 +19,7 @@ public DuplicateEntitiesException(
     this(
         "The following exception(s) occurred while checking the uniqueness of '"
             + entityName
-            + "' entities: "
-            + ExceptionUtils.getMessages(exceptions));
+            + "' entities: \n"
+            + ExceptionUtils.combineExceptions(exceptions));
   }
 }

src/main/java/edu/ie3/datamodel/exceptions/FailedValidationException.java

@@ -23,7 +23,6 @@ public FailedValidationException(String message) {
 
   /** @param exceptions List of exceptions, which must not be empty */
   public FailedValidationException(List<? extends Exception> exceptions) {
-    super(
-        "Validation failed due to: \n" + ExceptionUtils.getMessages(exceptions), exceptions.get(0));
+    super("Validation failed due to:\n " + ExceptionUtils.combineExceptions(exceptions));
   }
 }

src/main/java/edu/ie3/datamodel/exceptions/InvalidEntityException.java

@@ -13,13 +13,12 @@ public class InvalidEntityException extends ValidationException {
   private static final long serialVersionUID = 809496087520306374L;
 
   public InvalidEntityException(String faultDescription, UniqueEntity invalidEntity) {
-    super("Entity is invalid because of: \n" + faultDescription + " [" + invalidEntity + "]");
+    super("Entity is invalid because of: " + faultDescription + " [" + invalidEntity + "]");
   }
 
   public InvalidEntityException(
       String faultDescription, Throwable cause, UniqueEntity invalidEntity) {
-    super(
-        "Entity is invalid because of: \n" + faultDescription + " [" + invalidEntity + "]", cause);
+    super("Entity is invalid because of: " + faultDescription + " [" + invalidEntity + "]", cause);
   }
 
   public InvalidEntityException(String message, Throwable cause) {

src/main/java/edu/ie3/datamodel/exceptions/SourceException.java

@@ -32,6 +32,6 @@ public SourceException(final String message) {
   }
 
   public SourceException(String message, List<? extends Exception> exceptions) {
-    super(message + " " + ExceptionUtils.getMessages(exceptions), exceptions.get(0));
+    super(message + "\n " + ExceptionUtils.combineExceptions(exceptions));
   }
 }

src/main/java/edu/ie3/datamodel/io/factory/Factory.java

@@ -73,7 +73,7 @@ public Try<R, FactoryException> get(D data) {
    *     {@link Failure}
    */
   public Try<R, FactoryException> get(Try<D, ?> data) {
-    return data.transformF(FactoryException::new).flatMap(this::get);
+    return data.transformF(e -> new FactoryException(e.getMessage(), e)).flatMap(this::get);
   }
 
   /**

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

@@ -24,8 +24,9 @@
 public abstract class AssetInputEntityFactory<T extends AssetInput, D extends AssetInputEntityData>
     extends UniqueEntityFactory<T, D> {
 
-  private static final String OPERATES_FROM = "operatesFrom";
-  private static final String OPERATES_UNTIL = "operatesUntil";
+  protected static final String OPERATOR = "operator";
+  protected static final String OPERATES_FROM = "operatesFrom";
+  protected static final String OPERATES_UNTIL = "operatesUntil";
 
   @SafeVarargs
   protected AssetInputEntityFactory(Class<? extends T>... allowedClasses) {
@@ -48,14 +49,33 @@ protected List<Set<String>> getFields(Class<?> entityClass) {
     Set<String> constructorParamsUntil = expandSet(constructorParamsMin, OPERATES_UNTIL);
     Set<String> constructorParamsBoth = expandSet(constructorParamsFrom, OPERATES_UNTIL);
 
+    // with operator field
+    Set<String> constructorParamsOperator = expandSet(constructorParamsMin, OPERATOR);
+    Set<String> constructorParamsOperatorFrom = expandSet(constructorParamsFrom, OPERATOR);
+    Set<String> constructorParamsOperatorUntil = expandSet(constructorParamsUntil, OPERATOR);
+    Set<String> constructorParamsOperatorBoth = expandSet(constructorParamsBoth, OPERATOR);
+
     final String[] additionalFields = getAdditionalFields();
 
     constructorParamsMin = expandSet(constructorParamsMin, additionalFields);
     constructorParamsFrom = expandSet(constructorParamsFrom, additionalFields);
     constructorParamsUntil = expandSet(constructorParamsUntil, additionalFields);
     constructorParamsBoth = expandSet(constructorParamsBoth, additionalFields);
+
+    constructorParamsOperator = expandSet(constructorParamsOperator, additionalFields);
+    constructorParamsOperatorFrom = expandSet(constructorParamsOperatorFrom, additionalFields);
+    constructorParamsOperatorUntil = expandSet(constructorParamsOperatorUntil, additionalFields);
+    constructorParamsOperatorBoth = expandSet(constructorParamsOperatorBoth, additionalFields);
+
     return Arrays.asList(
-        constructorParamsMin, constructorParamsFrom, constructorParamsUntil, constructorParamsBoth);
+        constructorParamsMin,
+        constructorParamsFrom,
+        constructorParamsUntil,
+        constructorParamsBoth,
+        constructorParamsOperator,
+        constructorParamsOperatorFrom,
+        constructorParamsOperatorUntil,
+        constructorParamsOperatorBoth);
   }
 
   /**

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

@@ -8,10 +8,7 @@
 import edu.ie3.datamodel.models.OperationTime;
 import edu.ie3.datamodel.models.input.EmInput;
 import edu.ie3.datamodel.models.input.OperatorInput;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 public class EmInputFactory extends AssetInputEntityFactory<EmInput, EmAssetInputEntityData> {
 
@@ -23,21 +20,9 @@ public EmInputFactory() {
     super(EmInput.class);
   }
 
-  @Override
-  protected List<Set<String>> getFields(Class<?> entityClass) {
-    List<Set<String>> fields = new ArrayList<>(super.getFields(entityClass));
-
-    List<Set<String>> withEm =
-        fields.stream().map(f -> (Set<String>) expandSet(f, CONTROLLING_EM)).toList();
-
-    fields.addAll(withEm);
-
-    return fields;
-  }
-
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {CONTROL_STRATEGY};
+    return new String[] {CONTROL_STRATEGY, CONTROLLING_EM};
   }
 
   @Override

src/main/java/edu/ie3/datamodel/io/processor/ProcessorProvider.java

@@ -6,7 +6,6 @@
 package edu.ie3.datamodel.io.processor;
 
 import edu.ie3.datamodel.exceptions.EntityProcessorException;
-import edu.ie3.datamodel.exceptions.FailureException;
 import edu.ie3.datamodel.exceptions.ProcessorProviderException;
 import edu.ie3.datamodel.io.processor.input.InputEntityProcessor;
 import edu.ie3.datamodel.io.processor.result.ResultEntityProcessor;
@@ -313,25 +312,22 @@ public static Collection<EntityProcessor<? extends Entity>> allResultEntityProce
               Value,
               Value>>
       allTimeSeriesProcessors() throws EntityProcessorException {
-    try {
-      return Try.scanStream(
-              TimeSeriesProcessor.eligibleKeys.stream()
-                  .map(
-                      key ->
-                          Try.of(
-                              () ->
-                                  new TimeSeriesProcessor<>(
-                                      (Class<TimeSeries<TimeSeriesEntry<Value>, Value, Value>>)
-                                          key.getTimeSeriesClass(),
-                                      (Class<TimeSeriesEntry<Value>>) key.getEntryClass(),
-                                      (Class<Value>) key.getValueClass()),
-                              EntityProcessorException.class)),
-              "list of processors")
-          .getOrThrow()
-          .collect(Collectors.toMap(TimeSeriesProcessor::getRegisteredKey, Function.identity()));
-    } catch (FailureException e) {
-      throw new EntityProcessorException(e.getCause());
-    }
+    return Try.scanStream(
+            TimeSeriesProcessor.eligibleKeys.stream()
+                .map(
+                    key ->
+                        Try.of(
+                            () ->
+                                new TimeSeriesProcessor<>(
+                                    (Class<TimeSeries<TimeSeriesEntry<Value>, Value, Value>>)
+                                        key.getTimeSeriesClass(),
+                                    (Class<TimeSeriesEntry<Value>>) key.getEntryClass(),
+                                    (Class<Value>) key.getValueClass()),
+                            EntityProcessorException.class)),
+            "time series processors",
+            EntityProcessorException::new)
+        .getOrThrow()
+        .collect(Collectors.toMap(TimeSeriesProcessor::getRegisteredKey, Function.identity()));
   }
 
   @SuppressWarnings("unchecked cast")