Removing exception class information from combined exceptions.

Author: staudtMarius

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

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

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

@@ -23,6 +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: " + ExceptionUtils.combineExceptions(exceptions));
+    super("Validation failed due to:\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/source/EntitySource.java

@@ -205,11 +205,11 @@ protected static <E extends Entity, D extends EntityData> Stream<E> getEntities(
    */
   protected static Stream<Try<EntityData, SourceException>> buildEntityData(
       Class<? extends Entity> entityClass, DataSource dataSource) throws SourceException {
-    Stream<Map<String, String>> dataStream =
-        Try.of(() -> dataSource.getSourceData(entityClass), SourceException.class).getOrThrow();
-
-    return dataStream.map(
-        fieldsToAttributes -> new Try.Success<>(new EntityData(fieldsToAttributes, entityClass)));
+    return dataSource
+        .getSourceData(entityClass)
+        .map(
+            fieldsToAttributes ->
+                new Try.Success<>(new EntityData(fieldsToAttributes, entityClass)));
   }
 
   /**
@@ -373,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())));
   }
 
   /**
@@ -393,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

@@ -99,7 +99,10 @@ public GraphicElements getGraphicElements(Map<UUID, NodeInput> nodes, Map<UUID,
 
     if (!exceptions.isEmpty()) {
       throw new GraphicSourceException(
-          "Some exception(s) occurred while initializing graphic elements. ", exceptions);
+          "Exception(s) occurred in "
+              + exceptions.size()
+              + " input file(s) while initializing graphic elements. ",
+          exceptions);
     } else {
       // if everything is fine, return a GraphicElements instance
       // getOrThrow should not throw an exception in this context, because all exception are

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

@@ -160,7 +160,7 @@ public RawGridElements getGridData(
       throw new RawGridException(
           "Exception(s) occurred in "
               + exceptions.size()
-              + " input files while initializing raw grid.",
+              + " input file(s) while initializing raw grid.",
           exceptions);
     } else {
       /* build and return the grid if it is not empty */

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

@@ -227,7 +227,7 @@ public SystemParticipants getSystemParticipants(
       throw new SystemParticipantsException(
           "Exception(s) occurred in "
               + exceptions.size()
-              + " input files while initializing system participants.",
+              + " input file(s) while initializing system participants.",
           exceptions);
     } else {
       // if everything is fine, return a system participants container

src/main/java/edu/ie3/datamodel/utils/ExceptionUtils.java

@@ -13,24 +13,6 @@ private ExceptionUtils() {
     throw new IllegalStateException("Utility classes cannot be instantiated");
   }
 
-  /**
-   * Creates a string containing multiple exception messages.
-   *
-   * @param exceptions list of exceptions
-   * @return str containing the messages
-   */
-  public static String combineMessages(List<? extends Exception> exceptions) {
-    String messageSeparator = "\n ";
-
-    String messages =
-        exceptions.stream()
-            .map(Throwable::getMessage)
-            .reduce("", (a, b) -> a + messageSeparator + b);
-
-    // some formating
-    return messages.replace("\n", "\n       ").replaceFirst(messageSeparator, "");
-  }
-
   /**
    * Creates a string containing multiple exception messages.
    *
@@ -43,17 +25,18 @@ public static String combineExceptions(List<? extends Exception> exceptions) {
     // function to convert an exception into a string
     Function<Exception, String> converter =
         e -> {
-          String clazz = e.getClass().getName();
           String message = e.getMessage();
           Throwable cause = e.getCause();
 
-          String res = clazz + ": " + message;
-
           if (cause != null) {
-            res += " Caused by: " + cause.getClass().getName() + ": " + cause.getMessage();
+            String causeMessage = cause.getMessage();
+
+            if (!message.equalsIgnoreCase(causeMessage)) {
+              message += " Caused by: " + cause.getMessage();
+            }
           }
 
-          return res;
+          return message;
         };
 
     String messages =

src/test/groovy/edu/ie3/datamodel/io/source/EnergyManagementSourceTest.groovy

@@ -225,7 +225,7 @@ class EnergyManagementSourceTest extends Specification {
     then:
     def exc = thrown(SourceException)
     exc.message == "1 exception(s) occurred within \"EmInput\" data: \n" +
-    "        edu.ie3.datamodel.exceptions.FactoryException: An error occurred when creating instance of EmInput.class. Caused by: edu.ie3.datamodel.exceptions.FactoryException: Field \"id\" not found in EntityData"
+    "        An error occurred when creating instance of EmInput.class. Caused by: Field \"id\" not found in EntityData"
   }
 
   def "An EnergyManagementSource should fail if a parent em is not provided"() {

src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy

@@ -49,7 +49,7 @@ class EntitySourceTest extends Specification {
     then:
     SourceException ex = thrown()
     ex.message == "1 exception(s) occurred within \"OperatorInput\" data: \n" +
-    "        edu.ie3.datamodel.exceptions.FactoryException: An error occurred when creating instance of OperatorInput.class. Caused by: edu.ie3.datamodel.exceptions.FactoryException: Field \"id\" not found in EntityData"
+    "        An error occurred when creating instance of OperatorInput.class. Caused by: Field \"id\" not found in EntityData"
   }
 
   def "An EntitySource can build EntityData correctly"() {
@@ -169,12 +169,12 @@ class EntitySourceTest extends Specification {
     then:
     actual.failure
     actual.exception.get().class == SourceException
-    actual.exception.get().message.contains(expectedMessage)
+    actual.exception.get().message == expectedMessage
 
     where:
     fieldsToAttributes                                      | entityMap                                 | expectedMessage
-    ["operator": "no uuid"]                                 | map([OperatorInput.NO_OPERATOR_ASSIGNED]) | "Extracting UUID field operator from entity data"
-    ["operator": GridTestData.profBroccoli.uuid.toString()] | map([OperatorInput.NO_OPERATOR_ASSIGNED]) | "Entity with uuid f15105c4-a2de-4ab8-a621-4bc98e372d92 was not provided."
+    ["operator": "no uuid"]                                 | map([OperatorInput.NO_OPERATOR_ASSIGNED]) | "Extracting UUID for field 'operator' failed. Caused by: Exception while trying to parse UUID of field \"operator\" with value \"no uuid\""
+    ["operator": GridTestData.profBroccoli.uuid.toString()] | map([OperatorInput.NO_OPERATOR_ASSIGNED]) | "Extracting UUID for field 'operator' failed. Caused by: Entity with uuid f15105c4-a2de-4ab8-a621-4bc98e372d92 was not provided."
   }
 
   def "An EntitySource returns a failure if a given map does not contain the given uuid"() {