diff --git a/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java b/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java index a274fbecd..bdb6737b5 100644 --- a/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java +++ b/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java @@ -12,13 +12,13 @@ import edu.ie3.datamodel.models.input.connector.TransformerInput; import edu.ie3.datamodel.models.input.container.SubGridContainer; import java.io.Serializable; -import java.util.Objects; /** * Defines gates between {@link SubGridContainer}s and serves as edge definition for {@link * SubGridTopologyGraph} */ -public class SubGridGate implements Serializable { +public record SubGridGate(TransformerInput link, NodeInput superiorNode, NodeInput inferiorNode) + implements Serializable { /** * Creates a sub grid gate from two winding transformer. * @@ -40,47 +40,30 @@ public static SubGridGate fromTransformer2W(Transformer2WInput transformer) { */ public static SubGridGate fromTransformer3W( Transformer3WInput transformer, ConnectorPort inferiorPort) { - switch (inferiorPort) { - case B: - return new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeB()); - case C: - return new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeC()); - default: - throw new IllegalArgumentException( - "Only port " - + ConnectorPort.B - + " or " - + ConnectorPort.C - + " can be " - + "chosen as inferior port."); - } - } - - private final TransformerInput link; - private final NodeInput superiorNode; - private final NodeInput inferiorNode; - - /** - * Create a {@link SubGridGate} - * - * @param link Model, that physically represents the gate - * @param superiorNode Upstream node of the gate - * @param inferiorNode Downstream node of the gate - */ - public SubGridGate(TransformerInput link, NodeInput superiorNode, NodeInput inferiorNode) { - this.link = link; - this.superiorNode = superiorNode; - this.inferiorNode = inferiorNode; + return switch (inferiorPort) { + case B -> new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeB()); + case C -> new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeC()); + default -> throw new IllegalArgumentException( + "Only port " + + ConnectorPort.B + + " or " + + ConnectorPort.C + + " can be " + + "chosen as inferior port."); + }; } + @Deprecated(since = "3.0") public TransformerInput getLink() { return link; } + @Deprecated(since = "3.0") public NodeInput getSuperiorNode() { return superiorNode; } + @Deprecated(since = "3.0") public NodeInput getInferiorNode() { return inferiorNode; } @@ -93,21 +76,6 @@ public int getInferiorSubGrid() { return inferiorNode.getSubnet(); } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - SubGridGate that = (SubGridGate) o; - return link.equals(that.link) - && superiorNode.equals(that.superiorNode) - && inferiorNode.equals(that.inferiorNode); - } - - @Override - public int hashCode() { - return Objects.hash(link, superiorNode, inferiorNode); - } - @Override public String toString() { return "SubGridTopolgyEdge{" diff --git a/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java b/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java index 9df2348b9..929de9fc6 100644 --- a/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java +++ b/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java @@ -108,7 +108,7 @@ private BufferedCsvWriter initWriter(String baseDirectory, CsvFileDefinition fil /* Join the full DIRECTORY path (excluding file name) */ String baseDirectoryHarmonized = IoUtil.harmonizeFileSeparator(baseDirectory); String fullDirectoryPath = - FilenameUtils.concat(baseDirectoryHarmonized, fileDefinition.getDirectoryPath()); + FilenameUtils.concat(baseDirectoryHarmonized, fileDefinition.directoryPath()); String fullPath = FilenameUtils.concat(baseDirectoryHarmonized, fileDefinition.getFilePath()); /* Create missing directories */ @@ -122,13 +122,13 @@ private BufferedCsvWriter initWriter(String baseDirectory, CsvFileDefinition fil boolean append = pathFile.exists(); BufferedCsvWriter writer = new BufferedCsvWriter( - fullPath, fileDefinition.getHeadLineElements(), fileDefinition.getCsvSep(), append); + fullPath, fileDefinition.headLineElements(), fileDefinition.csvSep(), append); if (!append) { writer.writeFileHeader(); } else { log.warn( "File '{}' already exist. Will append new content WITHOUT new header! Full path: {}", - fileDefinition.getFileName(), + fileDefinition.fileName(), pathFile.getAbsolutePath()); } return writer; diff --git a/src/main/java/edu/ie3/datamodel/io/csv/BufferedCsvWriter.java b/src/main/java/edu/ie3/datamodel/io/csv/BufferedCsvWriter.java index 488e61fef..d091d310b 100644 --- a/src/main/java/edu/ie3/datamodel/io/csv/BufferedCsvWriter.java +++ b/src/main/java/edu/ie3/datamodel/io/csv/BufferedCsvWriter.java @@ -63,8 +63,8 @@ public BufferedCsvWriter(String baseFolder, CsvFileDefinition fileDefinition, bo throws IOException { this( baseFolder + File.separator + fileDefinition.getFilePath(), - fileDefinition.getHeadLineElements(), - fileDefinition.getCsvSep(), + fileDefinition.headLineElements(), + fileDefinition.csvSep(), append); } diff --git a/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java b/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java index ffd2213bd..79ca078ba 100644 --- a/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java +++ b/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java @@ -14,19 +14,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CsvFileDefinition { +public record CsvFileDefinition( + String fileName, String directoryPath, String[] headLineElements, String csvSep) { private static final Logger logger = LoggerFactory.getLogger(CsvFileDefinition.class); private static final Pattern FILE_NAME_PATTERN = Pattern.compile( "^(?[^\\\\/\\s.]{0,255})(?:\\.(?[a-zA-Z0-9]{0,10}(?:\\.[a-zA-Z0-9]{0,10})?))?$"); - protected static final String FILE_EXTENSION = "csv"; - - private final String directoryPath; - private final String fileName; - private final String[] headLineElements; - private final String csvSep; + private static final String FILE_EXTENSION = "csv"; public CsvFileDefinition( String fileName, String directoryPath, String[] headLineElements, String csvSep) { @@ -60,11 +56,13 @@ public CsvFileDefinition( this.csvSep = csvSep; } + @Deprecated(since = "3.0") public String getDirectoryPath() { return directoryPath; } /** @return The file name including extension */ + @Deprecated(since = "3.0") public String getFileName() { return fileName; } @@ -77,32 +75,16 @@ public String getFilePath() { return !directoryPath.isEmpty() ? FilenameUtils.concat(directoryPath, fileName) : fileName; } + @Deprecated(since = "3.0") public String[] getHeadLineElements() { return headLineElements; } + @Deprecated(since = "3.0") public String getCsvSep() { return csvSep; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof CsvFileDefinition)) return false; - CsvFileDefinition that = (CsvFileDefinition) o; - return directoryPath.equals(that.directoryPath) - && fileName.equals(that.fileName) - && Arrays.equals(headLineElements, that.headLineElements) - && csvSep.equals(that.csvSep); - } - - @Override - public int hashCode() { - int result = Objects.hash(directoryPath, fileName, csvSep); - result = 31 * result + Arrays.hashCode(headLineElements); - return result; - } - @Override public String toString() { return "CsvFileDefinition{" diff --git a/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java index f8ef4bc56..75b9910f9 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java @@ -73,22 +73,23 @@ public Optional> handleEntity(T entity) { @Override protected Optional handleProcessorSpecificQuantity( Quantity quantity, String fieldName) { - Optional normalizedQuantityValue = Optional.empty(); - switch (fieldName) { - case "energy", "eConsAnnual", "eStorage" -> normalizedQuantityValue = - quantityValToOptionalString(quantity.asType(Energy.class).to(StandardUnits.ENERGY_IN)); - case "q" -> normalizedQuantityValue = - quantityValToOptionalString( - quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_IN)); - case "p", "pMax", "pOwn", "pThermal" -> normalizedQuantityValue = - quantityValToOptionalString( - quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_IN)); - default -> log.error( - "Cannot process quantity with value '{}' for field with name {} in input entity processing!", - quantity, - fieldName); - } - return normalizedQuantityValue; + return switch (fieldName) { + case "energy", "eConsAnnual", "eStorage": + yield quantityValToOptionalString( + quantity.asType(Energy.class).to(StandardUnits.ENERGY_IN)); + case "q": + yield quantityValToOptionalString( + quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_IN)); + case "p", "pMax", "pOwn", "pThermal": + yield quantityValToOptionalString( + quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_IN)); + default: + log.error( + "Cannot process quantity with value '{}' for field with name {} in input entity processing!", + quantity, + fieldName); + yield Optional.empty(); + }; } @Override diff --git a/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java index 4bb56ef8f..1ab8a66b7 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java @@ -19,8 +19,6 @@ import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput; import edu.ie3.datamodel.models.input.thermal.ThermalBusInput; import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput; -import java.util.Arrays; -import java.util.Collections; import java.util.List; /** @@ -33,47 +31,46 @@ public class InputEntityProcessor extends EntityProcessor { /** The entities that can be used within this processor */ public static final List> eligibleEntityClasses = - Collections.unmodifiableList( - Arrays.asList( - /* InputEntity */ - OperatorInput.class, - RandomLoadParameters.class, - TimeSeriesMappingSource.MappingEntry.class, - /* - AssetInput */ - NodeInput.class, - LineInput.class, - Transformer2WInput.class, - Transformer3WInput.class, - SwitchInput.class, - MeasurementUnitInput.class, - ThermalBusInput.class, - /* -- SystemParticipantInput */ - ChpInput.class, - BmInput.class, - EvInput.class, - EvcsInput.class, - FixedFeedInInput.class, - HpInput.class, - LoadInput.class, - PvInput.class, - StorageInput.class, - WecInput.class, - /* -- ThermalUnitInput */ - ThermalHouseInput.class, - CylindricalStorageInput.class, - /* - GraphicInput */ - NodeGraphicInput.class, - LineGraphicInput.class, - /* - AssetTypeInput */ - BmTypeInput.class, - ChpTypeInput.class, - EvTypeInput.class, - HpTypeInput.class, - LineTypeInput.class, - Transformer2WTypeInput.class, - Transformer3WTypeInput.class, - StorageTypeInput.class, - WecTypeInput.class)); + List.of( + /* InputEntity */ + OperatorInput.class, + RandomLoadParameters.class, + TimeSeriesMappingSource.MappingEntry.class, + /* - AssetInput */ + NodeInput.class, + LineInput.class, + Transformer2WInput.class, + Transformer3WInput.class, + SwitchInput.class, + MeasurementUnitInput.class, + ThermalBusInput.class, + /* -- SystemParticipantInput */ + ChpInput.class, + BmInput.class, + EvInput.class, + EvcsInput.class, + FixedFeedInInput.class, + HpInput.class, + LoadInput.class, + PvInput.class, + StorageInput.class, + WecInput.class, + /* -- ThermalUnitInput */ + ThermalHouseInput.class, + CylindricalStorageInput.class, + /* - GraphicInput */ + NodeGraphicInput.class, + LineGraphicInput.class, + /* - AssetTypeInput */ + BmTypeInput.class, + ChpTypeInput.class, + EvTypeInput.class, + HpTypeInput.class, + LineTypeInput.class, + Transformer2WTypeInput.class, + Transformer3WTypeInput.class, + StorageTypeInput.class, + WecTypeInput.class); public InputEntityProcessor(Class registeredClass) { super(registeredClass); diff --git a/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java index 92ffffadc..c2d46340c 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java @@ -35,25 +35,24 @@ public class ResultEntityProcessor extends EntityProcessor { /** The entities that can be used within this processor */ public static final List> eligibleEntityClasses = - Collections.unmodifiableList( - Arrays.asList( - LoadResult.class, - FixedFeedInResult.class, - BmResult.class, - PvResult.class, - ChpResult.class, - WecResult.class, - StorageResult.class, - EvcsResult.class, - EvResult.class, - HpResult.class, - Transformer2WResult.class, - Transformer3WResult.class, - LineResult.class, - SwitchResult.class, - NodeResult.class, - ThermalHouseResult.class, - CylindricalStorageResult.class)); + List.of( + LoadResult.class, + FixedFeedInResult.class, + BmResult.class, + PvResult.class, + ChpResult.class, + WecResult.class, + StorageResult.class, + EvcsResult.class, + EvResult.class, + HpResult.class, + Transformer2WResult.class, + Transformer3WResult.class, + LineResult.class, + SwitchResult.class, + NodeResult.class, + ThermalHouseResult.class, + CylindricalStorageResult.class); public ResultEntityProcessor(Class registeredClass) { super(registeredClass); @@ -62,23 +61,23 @@ public ResultEntityProcessor(Class registeredClass) { @Override protected Optional handleProcessorSpecificQuantity( Quantity quantity, String fieldName) { - Optional normalizedQuantityValue = Optional.empty(); - switch (fieldName) { - case "energy", "eConsAnnual", "eStorage" -> normalizedQuantityValue = - quantityValToOptionalString( - quantity.asType(Energy.class).to(StandardUnits.ENERGY_RESULT)); - case "q" -> normalizedQuantityValue = - quantityValToOptionalString( - quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_RESULT)); - case "p", "pMax", "pOwn", "pThermal" -> normalizedQuantityValue = - quantityValToOptionalString( - quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_RESULT)); - default -> log.error( - "Cannot process quantity with value '{}' for field with name {} in result entity processing!", - quantity, - fieldName); - } - return normalizedQuantityValue; + return switch (fieldName) { + case "energy", "eConsAnnual", "eStorage": + yield quantityValToOptionalString( + quantity.asType(Energy.class).to(StandardUnits.ENERGY_RESULT)); + case "q": + yield quantityValToOptionalString( + quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_RESULT)); + case "p", "pMax", "pOwn", "pThermal": + yield quantityValToOptionalString( + quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_RESULT)); + default: + log.error( + "Cannot process quantity with value '{}' for field with name {} in result entity processing!", + quantity, + fieldName); + yield Optional.empty(); + }; } @Override diff --git a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java index 2bf193f60..2e334f5c9 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java @@ -6,42 +6,23 @@ package edu.ie3.datamodel.io.processor.timeseries; import java.lang.reflect.Method; -import java.util.Objects; /** * Represent a tuple of {@link FieldSource} to {@link Method} to highlight, where information of a * time series can be obtained from */ -public class FieldSourceToMethod { - private final FieldSource source; - private final Method method; - - public FieldSourceToMethod(FieldSource source, Method method) { - this.source = source; - this.method = method; - } +public record FieldSourceToMethod(FieldSource source, Method method) { + @Deprecated(since = "3.0") public FieldSource getSource() { return source; } + @Deprecated(since = "3.0") public Method getMethod() { return method; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - FieldSourceToMethod that = (FieldSourceToMethod) o; - return source == that.source && method.equals(that.method); - } - - @Override - public int hashCode() { - return Objects.hash(source, method); - } - @Override public String toString() { return "FieldSourceToMethod{" + "source=" + source + ", method=" + method + '}'; diff --git a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java index d8b7d09c9..e4b9dbcfa 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java @@ -29,30 +29,28 @@ public class TimeSeriesProcessor< * able to handle */ public static final List eligibleKeys = - Collections.unmodifiableList( - Arrays.asList( - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, EnergyPriceValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, TemperatureValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, WindValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, SolarIrradianceValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, WeatherValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, HeatDemandValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, PValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, HeatAndPValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, SValue.class), - new TimeSeriesProcessorKey( - IndividualTimeSeries.class, TimeBasedValue.class, HeatAndSValue.class), - new TimeSeriesProcessorKey( - LoadProfileInput.class, LoadProfileEntry.class, PValue.class))); + List.of( + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, EnergyPriceValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, TemperatureValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, WindValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, SolarIrradianceValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, WeatherValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, HeatDemandValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, PValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, HeatAndPValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, SValue.class), + new TimeSeriesProcessorKey( + IndividualTimeSeries.class, TimeBasedValue.class, HeatAndSValue.class), + new TimeSeriesProcessorKey(LoadProfileInput.class, LoadProfileEntry.class, PValue.class)); /** * Specific combination of time series class, entry class and value class, this processor is @@ -174,7 +172,7 @@ private SortedMap buildFieldToSource( jointMapping.putAll(valueMapping); /* Let uuid be the first entry */ - return Collections.unmodifiableSortedMap(putUuidFirst(jointMapping)); + return putUuidFirst(jointMapping); } @Override @@ -262,8 +260,8 @@ private Map handleEntry(T timeSeries, E entry) { */ private Map extractFieldToMethod(FieldSourceToMethod.FieldSource source) { return fieldToSource.entrySet().stream() - .filter(entry -> entry.getValue().getSource().equals(source)) - .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getMethod())); + .filter(entry -> entry.getValue().source().equals(source)) + .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().method())); } @Override diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/ConnectorInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/ConnectorInput.java index 894ad7aab..dd7ed2028 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/ConnectorInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/ConnectorInput.java @@ -78,7 +78,7 @@ public NodeInput getNodeB() { @Override public List allNodes() { - return Collections.unmodifiableList(Arrays.asList(getNodeA(), getNodeB())); + return List.of(getNodeA(), getNodeB()); } public int getParallelDevices() { diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java index 6aa59e522..54bafaa90 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java @@ -275,7 +275,7 @@ public String toString() { @Override public List allNodes() { - return Collections.unmodifiableList(Arrays.asList(getNodeA(), getNodeB(), nodeC)); + return List.of(getNodeA(), getNodeB(), nodeC); } /** diff --git a/src/test/groovy/edu/ie3/datamodel/io/csv/CsvFileDefinitionTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/csv/CsvFileDefinitionTest.groovy index 95ef5c334..d6823f60f 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/csv/CsvFileDefinitionTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/csv/CsvFileDefinitionTest.groovy @@ -35,10 +35,10 @@ class CsvFileDefinitionTest extends Specification { then: actual.with { - assert it.fileName == fileName - assert it.directoryPath == directory - assert it.headLineElements == headLineElements - assert it.csvSep == csvSep + assert it.fileName() == this.fileName + assert it.directoryPath() == this.directory + assert it.headLineElements() == this.headLineElements + assert it.csvSep() == this.csvSep } where: @@ -54,10 +54,10 @@ class CsvFileDefinitionTest extends Specification { then: actual.with { - assert it.fileName == fileName - assert it.directoryPath == "" - assert it.headLineElements == headLineElements - assert it.csvSep == csvSep + assert it.fileName() == this.fileName + assert it.directoryPath() == "" + assert it.headLineElements() == this.headLineElements + assert it.csvSep() == this.csvSep } } @@ -82,10 +82,10 @@ class CsvFileDefinitionTest extends Specification { then: actual.with { - assert it.fileName == this.fileName - assert it.directoryPath == directory - assert it.headLineElements == headLineElements - assert it.csvSep == csvSep + assert it.fileName() == this.fileName + assert it.directoryPath() == this.directory + assert it.headLineElements() == this.headLineElements + assert it.csvSep() == this.csvSep } } @@ -98,10 +98,10 @@ class CsvFileDefinitionTest extends Specification { then: actual.with { - assert it.fileName == this.fileName - assert it.directoryPath == directory - assert it.headLineElements == headLineElements - assert it.csvSep == csvSep + assert it.fileName() == this.fileName + assert it.directoryPath() == directory + assert it.headLineElements() == this.headLineElements + assert it.csvSep() == this.csvSep } } diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessorTest.groovy index b38daf3ff..8f479e6c6 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessorTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessorTest.groovy @@ -36,7 +36,7 @@ class TimeSeriesProcessorTest extends Specification implements TimeSeriesTestDat assert processor.fieldToSource.size() == expectedSourceMapping.size() processor.fieldToSource.each { key, value -> assert expectedSourceMapping.containsKey(key) - assert expectedSourceMapping.get(key) == value.source + assert expectedSourceMapping.get(key) == value.source() } /* Also test the logic of TimeSeriesProcessor#buildFieldToSource, because it is invoked during instantiation */ assert processor.headerElements == [ diff --git a/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy index 2b76d16ed..b8b82a732 100644 --- a/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy @@ -24,8 +24,6 @@ import spock.lang.Shared import spock.lang.Specification import tech.units.indriya.quantity.Quantities -import java.time.ZoneId - import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.* import static edu.ie3.util.quantities.PowerSystemUnits.PU @@ -140,20 +138,20 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getUuid() >> UUID.fromString("f076f7b5-3d17-401a-a11e-7b310f866649") - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getUuid() >> UUID.fromString("1bfd0c52-7122-4677-a075-6c97a691d4b4") - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCD = Mock(SwitchInput) switchCD.getUuid() >> UUID.fromString("01e6828b-8b7c-4d21-85cd-20891b64d530") - switchCD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeD)) + switchCD.allNodes() >> List.of(nodeC, nodeD) def transformerDE = Mock(Transformer2WInput) transformerDE.getUuid() >> UUID.fromString("8ec5667a-437e-43ac-b6f4-948810c785be") transformerDE.getNodeA() >> nodeD - transformerDE.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeD, nodeE)) + transformerDE.allNodes() >> List.of(nodeD, nodeE) def rawGridElements = new RawGridElements([ nodeA, @@ -210,22 +208,22 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getUuid() >> UUID.fromString("f076f7b5-3d17-401a-a11e-7b310f866649") - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getUuid() >> UUID.fromString("1bfd0c52-7122-4677-a075-6c97a691d4b4") - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCD = Mock(SwitchInput) switchCD.getUuid() >> UUID.fromString("01e6828b-8b7c-4d21-85cd-20891b64d530") - switchCD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeD)) + switchCD.allNodes() >> List.of(nodeC, nodeD) def transformerDEF = Mock(Transformer3WInput) transformerDEF.getUuid() >> UUID.fromString("8ec5667a-437e-43ac-b6f4-948810c785be") transformerDEF.getNodeA() >> nodeD transformerDEF.getNodeB() >> nodeE transformerDEF.getNodeC() >> nodeF - transformerDEF.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeD, nodeE, nodeF)) + transformerDEF.allNodes() >> List.of(nodeD, nodeE, nodeF) def rawGridElements = new RawGridElements([ nodeA, @@ -567,15 +565,15 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getNodeA() >> nodeA switchAB.getNodeB() >> nodeB - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getNodeA() >> nodeB switchBC.getNodeB() >> nodeC - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCD = Mock(SwitchInput) switchCD.getNodeA() >> nodeC switchCD.getNodeB() >> nodeD - switchCD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeD)) + switchCD.allNodes() >> List.of(nodeC, nodeD) def switches = new HashSet() switches.add(switchAB) @@ -607,15 +605,15 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getNodeA() >> nodeA switchAB.getNodeB() >> nodeB - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getNodeA() >> nodeB switchBC.getNodeB() >> nodeC - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCD = Mock(SwitchInput) switchCD.getNodeA() >> nodeC switchCD.getNodeB() >> nodeD - switchCD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeD)) + switchCD.allNodes() >> List.of(nodeC, nodeD) def switches = new HashSet() switches.add(switchAB) @@ -664,15 +662,15 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getNodeA() >> nodeA switchAB.getNodeB() >> nodeB - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getNodeA() >> nodeB switchBC.getNodeB() >> nodeC - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCA = Mock(SwitchInput) switchCA.getNodeA() >> nodeC switchCA.getNodeB() >> nodeA - switchCA.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeA)) + switchCA.allNodes() >> List.of(nodeC, nodeA) def switches = new HashSet() switches.add(switchAB) @@ -700,15 +698,15 @@ class ContainerUtilsTest extends Specification { def switchAB = Mock(SwitchInput) switchAB.getNodeA() >> nodeA switchAB.getNodeB() >> nodeB - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getNodeA() >> nodeB switchBC.getNodeB() >> nodeC - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchBD = Mock(SwitchInput) switchBD.getNodeA() >> nodeB switchBD.getNodeB() >> nodeD - switchBD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeD)) + switchBD.allNodes() >> List.of(nodeB, nodeD) def switches = new HashSet() switches.add(switchAB) @@ -718,7 +716,7 @@ class ContainerUtilsTest extends Specification { def possibleJunctions = new HashSet() when: - def actual = ContainerUtils.traverseAlongSwitchChain(nodeA, switches, possibleJunctions) + ContainerUtils.traverseAlongSwitchChain(nodeA, switches, possibleJunctions) then: IllegalArgumentException ex = thrown() @@ -739,7 +737,7 @@ class ContainerUtilsTest extends Specification { transformer.getUuid() >> UUID.fromString("ddcdd72a-5f97-4bef-913b-d32d31216e27") transformer.getNodeA() >> nodeD transformer.getNodeB() >> nodeE - transformer.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeD, nodeE)) + transformer.allNodes() >> List.of(nodeD, nodeE) def rawGridElements = new RawGridElements([nodeD, nodeE, transformer]) @@ -781,17 +779,17 @@ class ContainerUtilsTest extends Specification { transformer.getUuid() >> UUID.fromString("ddcdd72a-5f97-4bef-913b-d32d31216e27") transformer.getNodeA() >> nodeD transformer.getNodeB() >> nodeE - transformer.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeD, nodeE)) + transformer.allNodes() >> List.of(nodeD, nodeE) def switchAB = Mock(SwitchInput) switchAB.getUuid() >> UUID.fromString("5fcb8705-1436-4fbe-97b3-d2dcaf6a783b") - switchAB.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeA, nodeB)) + switchAB.allNodes() >> List.of(nodeA, nodeB) def switchBC = Mock(SwitchInput) switchBC.getUuid() >> UUID.fromString("4ca81b0b-e06d-408e-a991-de140f4e229b") - switchBC.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeB, nodeC)) + switchBC.allNodes() >> List.of(nodeB, nodeC) def switchCD = Mock(SwitchInput) switchCD.getUuid() >> UUID.fromString("92ce075e-9e3b-4ee6-89b6-19e6372fba01") - switchCD.allNodes() >> Collections.unmodifiableList(Arrays.asList(nodeC, nodeD)) + switchCD.allNodes() >> List.of(nodeC, nodeD) def rawGridElements = new RawGridElements([ nodeA,