Simplifying code.

Author: staudtMarius

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

@@ -5,20 +5,16 @@
 */
 package edu.ie3.datamodel.io.factory.timeseries;
 
-import edu.ie3.datamodel.exceptions.FactoryException;
 import edu.ie3.datamodel.io.factory.EntityData;
 import edu.ie3.datamodel.io.factory.EntityFactory;
 import edu.ie3.datamodel.io.source.TimeSeriesMappingSource;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class TimeSeriesMappingFactory
     extends EntityFactory<TimeSeriesMappingSource.MappingEntry, EntityData> {
   private static final String ENTITY = "entity";
-  private static final String PARTICIPANT = "participant";
   private static final String TIME_SERIES = "timeSeries";
 
   public TimeSeriesMappingFactory() {
@@ -27,21 +23,13 @@ public TimeSeriesMappingFactory() {
 
   @Override
   protected List<Set<String>> getFields(Class<?> entityClass) {
-    return List.of(
-        Stream.of(ENTITY, TIME_SERIES).collect(Collectors.toSet()),
-        Stream.of(PARTICIPANT, TIME_SERIES).collect(Collectors.toSet()));
+    return List.of(newSet(ENTITY, TIME_SERIES));
   }
 
   @Override
   protected TimeSeriesMappingSource.MappingEntry buildModel(EntityData data) {
+    UUID entity = data.getUUID(ENTITY);
     UUID timeSeries = data.getUUID(TIME_SERIES);
-
-    try {
-      UUID entity = data.getUUID(ENTITY);
-      return new TimeSeriesMappingSource.EntityMappingEntry(entity, timeSeries);
-    } catch (FactoryException e) {
-      UUID participant = data.getUUID(PARTICIPANT);
-      return new TimeSeriesMappingSource.ParticipantMappingEntry(participant, timeSeries);
-    }
+    return new TimeSeriesMappingSource.MappingEntry(entity, timeSeries);
   }
 }

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

@@ -80,8 +80,8 @@ private Try<MappingEntry, FactoryException> createMappingEntry(
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
   /** Class to represent one entry within the entity to time series mapping */
-  public abstract static class MappingEntry implements InputEntity {
-    protected final UUID entity;
+  public static class MappingEntry implements InputEntity {
+    private final UUID entity;
     private final UUID timeSeries;
 
     public MappingEntry(UUID entity, UUID timeSeries) {
@@ -116,43 +116,4 @@ public String toString() {
       return "MappingEntry{" + "entity=" + entity + ", timeSeries=" + timeSeries + '}';
     }
   }
-
-  /** Class to represent one entry within the entity to time series mapping */
-  public static class EntityMappingEntry extends MappingEntry {
-
-    public EntityMappingEntry(UUID entity, UUID timeSeries) {
-      super(entity, timeSeries);
-    }
-
-    @Override
-    public String toString() {
-      return "EntityMappingEntry{" + "entity=" + entity + ", timeSeries=" + getTimeSeries() + '}';
-    }
-  }
-
-  /** Class to represent one entry within the participant to time series mapping */
-  public static class ParticipantMappingEntry extends MappingEntry {
-
-    public ParticipantMappingEntry(UUID participant, UUID timeSeries) {
-      super(participant, timeSeries);
-    }
-
-    /**
-     * Returns the {@link UUID} of the {@link
-     * edu.ie3.datamodel.models.input.system.SystemParticipantInput}.
-     */
-    public UUID getParticipant() {
-      return entity;
-    }
-
-    @Override
-    public String toString() {
-      return "ParticipantMappingEntry{"
-          + "participant="
-          + entity
-          + ", timeSeries="
-          + getTimeSeries()
-          + '}';
-    }
-  }
 }

src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy

@@ -627,7 +627,7 @@ class InputEntityProcessorTest extends Specification {
   def "The InputEntityProcessor should serialize a provided MappingEntry correctly"() {
     given:
     def processor = new InputEntityProcessor(TimeSeriesMappingSource.MappingEntry)
-    def validResult = new TimeSeriesMappingSource.ParticipantMappingEntry(UUID.fromString("7eb7b296-f4c4-4020-acf3-e865453b5dbd"), UUID.fromString("bc581c6c-3044-48a1-aea1-5b2cb1370356"))
+    def validResult = new TimeSeriesMappingSource.MappingEntry(UUID.fromString("7eb7b296-f4c4-4020-acf3-e865453b5dbd"), UUID.fromString("bc581c6c-3044-48a1-aea1-5b2cb1370356"))
 
     Map expectedResults = [
       "entity": "7eb7b296-f4c4-4020-acf3-e865453b5dbd",

src/test/groovy/edu/ie3/datamodel/utils/validation/UniquenessValidationUtilsTest.groovy

@@ -169,8 +169,8 @@ class UniquenessValidationUtilsTest extends Specification {
     given:
     UUID timeSeries = UUID.randomUUID()
     Set<TimeSeriesMappingSource.MappingEntry> uniqueEntries = [
-      new TimeSeriesMappingSource.ParticipantMappingEntry(UUID.randomUUID(), timeSeries),
-      new TimeSeriesMappingSource.ParticipantMappingEntry(UUID.randomUUID(), timeSeries),
+      new TimeSeriesMappingSource.MappingEntry(UUID.randomUUID(), timeSeries),
+      new TimeSeriesMappingSource.MappingEntry(UUID.randomUUID(), timeSeries),
     ]
 
     when:
@@ -184,27 +184,18 @@ class UniquenessValidationUtilsTest extends Specification {
     given:
     UUID participant = UUID.fromString("1f25eea2-20eb-4b6b-8f05-bdbb0e851e65")
 
-    Set<TimeSeriesMappingSource.MappingEntry> uniqueParticipantEntries = [
-      new TimeSeriesMappingSource.ParticipantMappingEntry(participant, UUID.randomUUID()),
-      new TimeSeriesMappingSource.ParticipantMappingEntry(participant, UUID.randomUUID()),
-    ]
-
     Set<TimeSeriesMappingSource.MappingEntry> uniqueEntityEntries = [
-      new TimeSeriesMappingSource.EntityMappingEntry(participant, UUID.randomUUID()),
-      new TimeSeriesMappingSource.EntityMappingEntry(participant, UUID.randomUUID()),
+      new TimeSeriesMappingSource.MappingEntry(participant, UUID.randomUUID()),
+      new TimeSeriesMappingSource.MappingEntry(participant, UUID.randomUUID()),
     ]
 
     when:
-    def participantDuplicate = Try.ofVoid(() -> checkMappingEntryUniqueness(uniqueParticipantEntries), DuplicateEntitiesException)
     def entityDuplicate = Try.ofVoid(() -> checkMappingEntryUniqueness(uniqueEntityEntries), DuplicateEntitiesException)
 
     then:
-    participantDuplicate.failure
-    participantDuplicate.exception.get().message == "'ParticipantMappingEntry' entities with duplicated UUID key, but different field values found! " +
-    "Affected primary keys: [1f25eea2-20eb-4b6b-8f05-bdbb0e851e65]"
 
     entityDuplicate.failure
-    entityDuplicate.exception.get().message == "'EntityMappingEntry' entities with duplicated UUID key, but different field values found! " +
+    entityDuplicate.exception.get().message == "'MappingEntry' entities with duplicated UUID key, but different field values found! " +
     "Affected primary keys: [1f25eea2-20eb-4b6b-8f05-bdbb0e851e65]"
   }
 

src/test/resources/edu/ie3/datamodel/io/source/sql/_timeseries/time_series_mapping.sql

@@ -1,15 +1,14 @@
 CREATE TABLE public.time_series_mapping
 (
-    uuid uuid PRIMARY KEY,
-    participant uuid,
+    entity uuid PRIMARY KEY,
     time_series uuid
 )
     WITHOUT OIDS
     TABLESPACE pg_default;
 
 INSERT INTO
-    public.time_series_mapping (uuid, participant, time_series)
+    public.time_series_mapping (entity, time_series)
 VALUES
-('58167015-d760-4f90-8109-f2ebd94cda91', 'b86e95b0-e579-4a80-a534-37c7a470a409', '9185b8c1-86ba-4a16-8dea-5ac898e8caa5'),
-('9a9ebfda-dc26-4a40-b9ca-25cd42f6cc3f', 'c7ebcc6c-55fc-479b-aa6b-6fa82ccac6b8', '3fbfaa97-cff4-46d4-95ba-a95665e87c26'),
-('9c1c53ea-e575-41a2-a373-a8b2d3ed2c39', '90a96daa-012b-4fea-82dc-24ba7a7ab81c', '3fbfaa97-cff4-46d4-95ba-a95665e87c26');
+('b86e95b0-e579-4a80-a534-37c7a470a409', '9185b8c1-86ba-4a16-8dea-5ac898e8caa5'),
+('c7ebcc6c-55fc-479b-aa6b-6fa82ccac6b8', '3fbfaa97-cff4-46d4-95ba-a95665e87c26'),
+('90a96daa-012b-4fea-82dc-24ba7a7ab81c', '3fbfaa97-cff4-46d4-95ba-a95665e87c26');