From bf77b86eb2f0b377c4ed7ccec4ffff1f97ff6271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2025 04:35:29 +0000 Subject: [PATCH 1/3] Bump com.github.ie3-institute:PowerSystemDataModel from 5.1.0 to 6.0.0 Bumps [com.github.ie3-institute:PowerSystemDataModel](https://github.com/ie3-institute/PowerSystemDatamodel) from 5.1.0 to 6.0.0. - [Release notes](https://github.com/ie3-institute/PowerSystemDatamodel/releases) - [Changelog](https://github.com/ie3-institute/PowerSystemDataModel/blob/dev/CHANGELOG.md) - [Commits](https://github.com/ie3-institute/PowerSystemDatamodel/compare/5.1.0...6.0.0) --- updated-dependencies: - dependency-name: com.github.ie3-institute:PowerSystemDataModel dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9456e6fd..b167ed69 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ dependencies{ } //PSDM - implementation('com.github.ie3-institute:PowerSystemDataModel:5.1.0') { + implementation('com.github.ie3-institute:PowerSystemDataModel:6.0.0') { exclude group: 'org.apache.logging.log4j' exclude group: 'org.slf4j' /* Exclude our own nested dependencies */ From 823f24bbdbf1392cda450bb8987aae2c8f4f7f47 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Mon, 3 Mar 2025 16:57:47 +0100 Subject: [PATCH 2/3] Adaptations in spotless.gradle --- gradle/scripts/spotless.gradle | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gradle/scripts/spotless.gradle b/gradle/scripts/spotless.gradle index 7021b9f2..b72b5d27 100644 --- a/gradle/scripts/spotless.gradle +++ b/gradle/scripts/spotless.gradle @@ -20,17 +20,15 @@ spotless { licenseHeader "#!groovy\n\n" + ie3LicHead, "////////////////////////////////" // the Groovy Eclipse formatter extends the Java Eclipse formatter, // so it formats Java files by default (unless `excludeJava` is used). - // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860 - greclipse('4.27') - indentWithSpaces 2 + greclipse() + leadingTabsToSpaces 2 } groovyGradle { // same as groovy, but for .gradle (defaults to '*.gradle') target '*.gradle', 'gradle/scripts/*.gradle' - // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860 - greclipse('4.27') - indentWithSpaces 2 + greclipse() + leadingTabsToSpaces 2 } //sets a license header, removes unused imports and formats conforming to the scala fmt formatter @@ -43,7 +41,7 @@ spotless { format 'misc', { target '**/.gitignore', 'configs/**' trimTrailingWhitespace() - indentWithTabs() + leadingSpacesToTabs() endWithNewline() } @@ -51,7 +49,7 @@ spotless { * enumerations) */ format 'md', { target '**/*.md' - indentWithSpaces 2 + leadingTabsToSpaces 2 endWithNewline() } } From 51763c95cfa59206cef5ebf14d01f6bb9aee61b0 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Mon, 3 Mar 2025 16:57:55 +0100 Subject: [PATCH 3/3] Adapting to changes --- .../simona/api/data/results/ExtResultContainer.java | 10 +++++----- .../api/data/results/ExtResultDataConnection.java | 10 +++++----- .../data/results/ontology/ProvideResultEntities.java | 6 +++--- .../edu/ie3/simona/api/simulation/ExtCoSimulation.java | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/ie3/simona/api/data/results/ExtResultContainer.java b/src/main/java/edu/ie3/simona/api/data/results/ExtResultContainer.java index 531faf7c..30ad84d1 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ExtResultContainer.java +++ b/src/main/java/edu/ie3/simona/api/data/results/ExtResultContainer.java @@ -8,8 +8,8 @@ import static edu.ie3.util.quantities.PowerSystemUnits.PU; -import edu.ie3.datamodel.models.result.ModelResultEntity; import edu.ie3.datamodel.models.result.NodeResult; +import edu.ie3.datamodel.models.result.ResultEntity; import edu.ie3.datamodel.models.result.connector.LineResult; import edu.ie3.datamodel.models.result.system.SystemParticipantResult; import edu.ie3.simona.api.data.ExtDataContainer; @@ -32,7 +32,7 @@ public class ExtResultContainer implements ExtDataContainer { * Map external id to result from SIMONA ATTENTION: The time stamp of the result entities is not * necessarily corresponding to the tick */ - private final Map simonaResultsMap; + private final Map simonaResultsMap; /** * Container class for result data from SIMONA @@ -42,17 +42,17 @@ public class ExtResultContainer implements ExtDataContainer { * @param nextTick tick the external simulation can expect the next results */ public ExtResultContainer( - long tick, Map simonaResultsMap, Optional nextTick) { + long tick, Map simonaResultsMap, Optional nextTick) { this.tick = tick; this.simonaResultsMap = simonaResultsMap; this.maybeNextTick = nextTick; } - public ExtResultContainer(long tick, Map simonaResultsMap) { + public ExtResultContainer(long tick, Map simonaResultsMap) { this(tick, simonaResultsMap, Optional.empty()); } - public Map getResults() { + public Map getResults() { return simonaResultsMap; } diff --git a/src/main/java/edu/ie3/simona/api/data/results/ExtResultDataConnection.java b/src/main/java/edu/ie3/simona/api/data/results/ExtResultDataConnection.java index de90fa41..a5414e26 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ExtResultDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/results/ExtResultDataConnection.java @@ -6,8 +6,8 @@ package edu.ie3.simona.api.data.results; -import edu.ie3.datamodel.models.result.ModelResultEntity; import edu.ie3.datamodel.models.result.NodeResult; +import edu.ie3.datamodel.models.result.ResultEntity; import edu.ie3.datamodel.models.result.system.SystemParticipantResult; import edu.ie3.simona.api.data.ExtOutputDataConnection; import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage; @@ -74,7 +74,7 @@ public List getParticipantResultDataAssets() { } /** Method that an external simulation can request results from SIMONA as a list. */ - private List requestResultList(long tick) throws InterruptedException { + private List requestResultList(long tick) throws InterruptedException { sendExtMsg(new RequestResultEntities(tick)); return receiveWithType(ProvideResultEntities.class).results(); } @@ -82,12 +82,12 @@ private List requestResultList(long tick) throws InterruptedE /** * Method that an external simulation can request results from SIMONA as a map string to object. */ - public Map requestResults(long tick) throws InterruptedException { + public Map requestResults(long tick) throws InterruptedException { return createResultMap(requestResultList(tick)); } - protected Map createResultMap(List results) { - Map resultMap = new HashMap<>(); + protected Map createResultMap(List results) { + Map resultMap = new HashMap<>(); results.forEach( result -> { if (result instanceof NodeResult nodeResult) { diff --git a/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java b/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java index 525d702c..0c0d003f 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java +++ b/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java @@ -6,15 +6,15 @@ package edu.ie3.simona.api.data.results.ontology; -import edu.ie3.datamodel.models.result.ModelResultEntity; +import edu.ie3.datamodel.models.result.ResultEntity; import java.util.List; import java.util.Map; import java.util.UUID; /** Provides a list of results from SIMONA to an external simulation. */ -public record ProvideResultEntities(List results) +public record ProvideResultEntities(List results) implements ResultDataResponseMessageToExt { - public ProvideResultEntities(Map resultMap) { + public ProvideResultEntities(Map resultMap) { this(resultMap.values().stream().toList()); } } diff --git a/src/main/java/edu/ie3/simona/api/simulation/ExtCoSimulation.java b/src/main/java/edu/ie3/simona/api/simulation/ExtCoSimulation.java index f07ec9bd..76923312 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ExtCoSimulation.java +++ b/src/main/java/edu/ie3/simona/api/simulation/ExtCoSimulation.java @@ -6,7 +6,7 @@ package edu.ie3.simona.api.simulation; -import edu.ie3.datamodel.models.result.ModelResultEntity; +import edu.ie3.datamodel.models.result.ResultEntity; import edu.ie3.datamodel.models.value.Value; import edu.ie3.simona.api.data.DataQueueExtSimulationExtSimulator; import edu.ie3.simona.api.data.ExtInputDataContainer; @@ -169,7 +169,7 @@ protected void sendDataToExt( ExtResultDataConnection connection, long tick, Optional maybeNextTick, Logger log) throws InterruptedException { log.debug("Request results from SIMONA!"); - Map resultsToBeSend = connection.requestResults(tick); + Map resultsToBeSend = connection.requestResults(tick); log.debug("Received results from SIMONA!"); dataQueueSimonaApiToExtCoSimulator.queueData( new ExtResultContainer(tick, resultsToBeSend, maybeNextTick));