Merge branch 'dev' into ms/#1007-refactor-CsvFileConnector-and-CsvDataSource

Author: staudtMarius

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enhancing `VoltageLevel` with `equals` method [#1063](https://github.com/ie3-institute/PowerSystemDataModel/issues/1063)
 
 ### Fixed
+- Fixed `MappingEntryies` not getting processed by adding `Getter` methods for record fields [#1084](https://github.com/ie3-institute/PowerSystemDataModel/issues/1084) 
 
 ### Changed
 - Improvements to the search for corner points in `IdCoordinateSource` [#1016](https://github.com/ie3-institute/PowerSystemDataModel/issues/1016)

build.gradle

@@ -5,7 +5,7 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '6.25.0' //code format
-  id 'com.github.spotbugs' version '6.0.12' // code check, working on byte code
+  id 'com.github.spotbugs' version '6.0.14' // 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
@@ -18,7 +18,7 @@ ext {
   javaVersion = JavaVersion.VERSION_17
   groovyVersion = "4.0"
   groovyBinaryVersion = "4.0.21"
-  testcontainersVersion = '1.19.7'
+  testcontainersVersion = '1.19.8'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }
@@ -73,7 +73,7 @@ dependencies {
   testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
   testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
   testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
-  testImplementation 'net.bytebuddy:byte-buddy:1.14.14' // Mocks of classes
+  testImplementation 'net.bytebuddy:byte-buddy:1.14.15' // Mocks of classes
 
   // testcontainers (docker framework for testing)
   testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -94,7 +94,7 @@ dependencies {
   runtimeOnly 'org.postgresql:postgresql:42.7.3' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.16.1' // I/O functionalities
-  implementation 'commons-codec:commons-codec:1.16.1' // needed by commons-compress
+  implementation 'commons-codec:commons-codec:1.17.0' // needed by commons-compress
   implementation 'org.apache.commons:commons-compress:1.26.1' // I/O functionalities
 }
 

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

@@ -10,6 +10,8 @@
 import edu.ie3.datamodel.io.factory.EntityData;
 import edu.ie3.datamodel.io.factory.timeseries.TimeSeriesMappingFactory;
 import edu.ie3.datamodel.models.input.InputEntity;
+import edu.ie3.datamodel.models.input.system.SystemParticipantInput;
+import edu.ie3.datamodel.models.timeseries.TimeSeries;
 import edu.ie3.datamodel.utils.Try;
 import edu.ie3.datamodel.utils.Try.*;
 import java.util.*;
@@ -75,6 +77,16 @@ private Try<MappingEntry, FactoryException> createMappingEntry(
   /** Class to represent one entry within the participant to time series mapping */
   public record MappingEntry(UUID participant, UUID timeSeries) implements InputEntity {
 
+    /** Returns the {@link UUID} of the {@link SystemParticipantInput}. */
+    public UUID getParticipant() {
+      return participant;
+    }
+
+    /** Returns the {@link UUID} of the {@link TimeSeries}. */
+    public UUID getTimeSeries() {
+      return timeSeries;
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;

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

@@ -7,6 +7,7 @@ package edu.ie3.datamodel.io.processor.input
 
 import static edu.ie3.util.quantities.PowerSystemUnits.PU
 
+import edu.ie3.datamodel.io.source.TimeSeriesMappingSource
 import edu.ie3.datamodel.models.OperationTime
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.UniqueEntity
@@ -626,6 +627,23 @@ class InputEntityProcessorTest extends Specification {
     actual == expected
   }
 
+  def "The InputEntityProcessor should serialize a provided MappingEntry correctly"() {
+    given:
+    def processor = new InputEntityProcessor(TimeSeriesMappingSource.MappingEntry)
+    def validResult = new TimeSeriesMappingSource.MappingEntry(UUID.fromString("7eb7b296-f4c4-4020-acf3-e865453b5dbd"), UUID.fromString("bc581c6c-3044-48a1-aea1-5b2cb1370356"))
+
+    Map expectedResults = [
+      "participant": "7eb7b296-f4c4-4020-acf3-e865453b5dbd",
+      "timeSeries": "bc581c6c-3044-48a1-aea1-5b2cb1370356"
+    ]
+
+    when: "the entity is passed to the processor"
+    def processingResult = processor.handleEntity(validResult)
+
+    then: "make sure that the result is as expected "
+    processingResult == expectedResults
+  }
+
   def "The InputEntityProcessor should serialize an entity but ignore the operator field when OperatorInput is equal to NO_OPERATOR_ASSIGNED"() {
     given:
     InputEntityProcessor processor = new InputEntityProcessor(NodeInput)