Merge branch 'dev' into ms/#1226-change-SubgridContainer-to-be-in-line-with-the-galvanical-seperation

# Conflicts:
#	CHANGELOG.md

Author: staudtMarius

CHANGELOG.md

@@ -6,6 +6,9 @@ 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)
+
 ### 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)
@@ -14,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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)
 - Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
 
 ## [7.0.0] - 2025-05-08

build.gradle

@@ -5,7 +5,7 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   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 'com.github.spotbugs' version '6.2.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

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/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")

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

@@ -204,14 +204,12 @@ protected static <E extends Entity, D extends EntityData> Stream<E> getEntities(
    * @return a stream of the entity data wrapped in a {@link Try}
    */
   protected static Stream<Try<EntityData, SourceException>> buildEntityData(
-      Class<? extends Entity> entityClass, DataSource dataSource) {
-    return Try.of(() -> dataSource.getSourceData(entityClass), SourceException.class)
-        .convert(
-            data ->
-                data.map(
-                    fieldsToAttributes ->
-                        new Try.Success<>(new EntityData(fieldsToAttributes, entityClass))),
-            exception -> Stream.of(Failure.of(exception)));
+      Class<? extends Entity> entityClass, DataSource dataSource) throws SourceException {
+    return dataSource
+        .getSourceData(entityClass)
+        .map(
+            fieldsToAttributes ->
+                new Try.Success<>(new EntityData(fieldsToAttributes, entityClass)));
   }
 
   /**
@@ -227,7 +225,8 @@ protected static Stream<Try<EntityData, SourceException>> buildEntityData(
   protected static <E extends EntityData> Stream<Try<E, SourceException>> buildEntityData(
       Class<? extends Entity> entityClass,
       DataSource dataSource,
-      WrappedFunction<EntityData, E> converter) {
+      WrappedFunction<EntityData, E> converter)
+      throws SourceException {
     return buildEntityData(entityClass, dataSource).map(converter);
   }
 
@@ -356,9 +355,7 @@ Function<Pair<E, T>, R> enrichFunction(
    */
   protected static <S, E extends Exception> Stream<S> unpack(
       Stream<Try<S, E>> inputStream, Class<S> clazz) throws SourceException {
-    return Try.scanStream(inputStream, clazz.getSimpleName())
-        .transformF(SourceException::new)
-        .getOrThrow();
+    return Try.scanStream(inputStream, clazz.getSimpleName(), SourceException::new).getOrThrow();
   }
 
   /**
@@ -376,16 +373,14 @@ protected static <E extends EntityData, R> Try<R, SourceException> extractFuncti
     return entityData.flatMap(
         data ->
             Try.of(() -> data.getUUID(fieldName), FactoryException.class)
+                .flatMap(entityUuid -> extractFunction(entityUuid, entities))
                 .transformF(
                     exception ->
                         new SourceException(
-                            "Extracting UUID field "
+                            "Extracting UUID for field '"
                                 + fieldName
-                                + " from entity data "
-                                + entityData
-                                + " failed.",
-                            exception))
-                .flatMap(entityUuid -> extractFunction(entityUuid, entities)));
+                                + "' failed. Caused by: "
+                                + exception.getMessage())));
   }
 
   /**
@@ -396,13 +391,13 @@ protected static <E extends EntityData, R> Try<R, SourceException> extractFuncti
    * @return a try of the {@link Entity}
    * @param <T> type of entity
    */
-  protected static <T> Try<T, SourceException> extractFunction(UUID uuid, Map<UUID, T> entityMap) {
+  protected static <T> Try<T, FactoryException> extractFunction(UUID uuid, Map<UUID, T> entityMap) {
     return Optional.ofNullable(entityMap.get(uuid))
         // We either find a matching entity for given UUID, thus return a success
-        .map(entity -> Try.of(() -> entity, SourceException.class))
+        .map(entity -> Try.of(() -> entity, FactoryException.class))
         // ... or find no matching entity, returning a failure.
         .orElse(
-            new Failure<>(new SourceException("Entity with uuid " + uuid + " was not provided.")));
+            new Failure<>(new FactoryException("Entity with uuid " + uuid + " was not provided.")));
   }
 
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

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

@@ -59,8 +59,8 @@ public void validate() throws ValidationException {
             Stream.of(
                 validate(NodeGraphicInput.class, dataSource, nodeGraphicInputFactory),
                 validate(LineGraphicInput.class, dataSource, lineGraphicInputFactory)),
-            "Validation")
-        .transformF(FailedValidationException::new)
+            "Validation",
+            FailedValidationException::new)
         .getOrThrow();
   }
 
@@ -95,11 +95,13 @@ public GraphicElements getGraphicElements(Map<UUID, NodeInput> nodes, Map<UUID,
     Try<Set<LineGraphicInput>, SourceException> lineGraphics =
         Try.of(() -> getLineGraphicInput(lines), SourceException.class);
 
-    List<SourceException> exceptions = Try.getExceptions(List.of(nodeGraphics, lineGraphics));
+    List<SourceException> exceptions = Try.getExceptions(nodeGraphics, lineGraphics);
 
     if (!exceptions.isEmpty()) {
       throw new GraphicSourceException(
-          exceptions.size() + " error(s) occurred while initializing graphic elements. ",
+          "Exception(s) occurred in "
+              + exceptions.size()
+              + " input file(s) while initializing graphic elements. ",
           exceptions);
     } else {
       // if everything is fine, return a GraphicElements instance