From 6243f1538001c5d44dbe91fc29518df2b8183de6 Mon Sep 17 00:00:00 2001 From: staudtMarius Date: Tue, 24 Jun 2025 16:53:28 +0200 Subject: [PATCH] Refactoring messages and models. --- CHANGELOG.md | 2 ++ .../simona/api/data/connection/BiDirectional.java | 4 ++-- .../api/data/connection/ExtEmDataConnection.java | 6 +++--- .../api/data/connection/ExtEvDataConnection.java | 4 ++-- .../data/connection/ExtInputDataConnection.java | 6 +++--- .../data/connection/ExtOutputDataConnection.java | 2 +- .../data/connection/ExtPrimaryDataConnection.java | 4 ++-- .../data/connection/ExtResultDataConnection.java | 8 ++++---- .../api/data/connection/ExtResultListener.java | 2 +- .../api/data/{ev/model => model/ev}/EvModel.java | 2 +- .../{data => }/ontology/DataMessageFromExt.java | 2 +- .../ontology/DataResponseMessageToExt.java | 2 +- .../ontology/ScheduleDataServiceMessage.java | 4 ++-- .../em}/EmDataMessageFromExt.java | 4 ++-- .../em}/EmDataResponseMessageToExt.java | 4 ++-- .../em}/ProvideEmSetPointData.java | 2 +- .../ev}/EvDataMessageFromExt.java | 4 ++-- .../ev}/EvDataResponseMessageToExt.java | 4 ++-- .../ev}/ProvideArrivingEvs.java | 4 ++-- .../ev}/ProvideCurrentPrices.java | 2 +- .../ev}/ProvideDepartingEvs.java | 4 ++-- .../ev}/ProvideEvcsFreeLots.java | 2 +- .../ev}/RequestCurrentPrices.java | 2 +- .../ev}/RequestDepartingEvs.java | 2 +- .../ev}/RequestEvcsFreeLots.java | 2 +- .../primary}/PrimaryDataMessageFromExt.java | 4 ++-- .../primary}/ProvidePrimaryData.java | 2 +- .../results}/ProvideResultEntities.java | 2 +- .../results}/RequestResultEntities.java | 2 +- .../results}/ResultDataMessageFromExt.java | 4 ++-- .../results}/ResultDataResponseMessageToExt.java | 4 ++-- .../simulation}/ActivationMessage.java | 2 +- .../simulation}/CompletionMessage.java | 2 +- .../simulation}/ControlMessageToExt.java | 2 +- .../simulation}/ControlResponseMessageFromExt.java | 2 +- .../simulation}/TerminationCompleted.java | 2 +- .../simulation}/TerminationMessage.java | 2 +- .../simona/api/simulation/ExtSimAdapterData.java | 4 ++-- .../ie3/simona/api/simulation/ExtSimulation.java | 2 +- .../data/connection/ExtEmDataConnectionTest.groovy | 6 +++--- .../data/connection/ExtEvDataConnectionTest.groovy | 14 ++++++++++---- .../connection/ExtPrimaryDataConnectionTest.groovy | 6 +++--- .../connection/ExtResultDataConnectionTest.groovy | 10 +++++----- .../data/connection/ExtResultListenerTest.groovy | 2 +- .../simona/api/simulation/ExtSimulationSpec.groovy | 7 ++++++- 45 files changed, 89 insertions(+), 76 deletions(-) rename src/main/java/edu/ie3/simona/api/data/{ev/model => model/ev}/EvModel.java (96%) rename src/main/java/edu/ie3/simona/api/{data => }/ontology/DataMessageFromExt.java (87%) rename src/main/java/edu/ie3/simona/api/{data => }/ontology/DataResponseMessageToExt.java (87%) rename src/main/java/edu/ie3/simona/api/{data => }/ontology/ScheduleDataServiceMessage.java (77%) rename src/main/java/edu/ie3/simona/api/{data/em/ontology => ontology/em}/EmDataMessageFromExt.java (76%) rename src/main/java/edu/ie3/simona/api/{data/em/ontology => ontology/em}/EmDataResponseMessageToExt.java (75%) rename src/main/java/edu/ie3/simona/api/{data/em/ontology => ontology/em}/ProvideEmSetPointData.java (92%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/EvDataMessageFromExt.java (70%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/EvDataResponseMessageToExt.java (74%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/ProvideArrivingEvs.java (87%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/ProvideCurrentPrices.java (92%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/ProvideDepartingEvs.java (87%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/ProvideEvcsFreeLots.java (93%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/RequestCurrentPrices.java (87%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/RequestDepartingEvs.java (92%) rename src/main/java/edu/ie3/simona/api/{data/ev/ontology => ontology/ev}/RequestEvcsFreeLots.java (87%) rename src/main/java/edu/ie3/simona/api/{data/primarydata/ontology => ontology/primary}/PrimaryDataMessageFromExt.java (74%) rename src/main/java/edu/ie3/simona/api/{data/primarydata/ontology => ontology/primary}/ProvidePrimaryData.java (90%) rename src/main/java/edu/ie3/simona/api/{data/results/ontology => ontology/results}/ProvideResultEntities.java (92%) rename src/main/java/edu/ie3/simona/api/{data/results/ontology => ontology/results}/RequestResultEntities.java (89%) rename src/main/java/edu/ie3/simona/api/{data/results/ontology => ontology/results}/ResultDataMessageFromExt.java (74%) rename src/main/java/edu/ie3/simona/api/{data/results/ontology => ontology/results}/ResultDataResponseMessageToExt.java (75%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/ActivationMessage.java (88%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/CompletionMessage.java (90%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/ControlMessageToExt.java (86%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/ControlResponseMessageFromExt.java (86%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/TerminationCompleted.java (87%) rename src/main/java/edu/ie3/simona/api/{simulation/ontology => ontology/simulation}/TerminationMessage.java (90%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e32c140e..52e41c82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Adapted dependabot workflow and added CODEOWNERS [#294](https://github.com/ie3-institute/simonaAPI/issues/294) - Refactoring external data connection [#267](https://github.com/ie3-institute/simonaAPI/issues/267) - Refactoring data containers [#268](https://github.com/ie3-institute/simonaAPI/issues/268) +- Refactoring messages [#269](https://github.com/ie3-institute/simonaAPI/issues/269) +- Refactoring models [#270](https://github.com/ie3-institute/simonaAPI/issues/270) ## [0.9.0] - 2025-05-09 diff --git a/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java b/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java index 42dc2a0e..631a1c37 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java @@ -6,9 +6,9 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; -import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt; import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException; +import edu.ie3.simona.api.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.DataResponseMessageToExt; import java.util.concurrent.LinkedBlockingQueue; /** diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java index 543360bd..ba5d3fe9 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java @@ -6,10 +6,10 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.em.ontology.EmDataMessageFromExt; -import edu.ie3.simona.api.data.em.ontology.EmDataResponseMessageToExt; -import edu.ie3.simona.api.data.em.ontology.ProvideEmSetPointData; import edu.ie3.simona.api.data.model.em.EmSetPoint; +import edu.ie3.simona.api.ontology.em.EmDataMessageFromExt; +import edu.ie3.simona.api.ontology.em.EmDataResponseMessageToExt; +import edu.ie3.simona.api.ontology.em.ProvideEmSetPointData; import java.util.*; import org.slf4j.Logger; diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java index 36f4e652..8f77f15b 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java @@ -6,8 +6,8 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.ev.model.EvModel; -import edu.ie3.simona.api.data.ev.ontology.*; +import edu.ie3.simona.api.data.model.ev.EvModel; +import edu.ie3.simona.api.ontology.ev.*; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java index 8d956292..56418995 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java @@ -6,9 +6,9 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; -import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage; -import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt; +import edu.ie3.simona.api.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage; +import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt; import org.apache.pekko.actor.typed.ActorRef; /** diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java index ca632c2b..23dab268 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java @@ -6,7 +6,7 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt; +import edu.ie3.simona.api.ontology.DataResponseMessageToExt; /** * Interface for a connection between SIMONA and an external simulation with data flow from SIMONA diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java index a157857c..e75a978f 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java @@ -7,8 +7,8 @@ package edu.ie3.simona.api.data.connection; import edu.ie3.datamodel.models.value.Value; -import edu.ie3.simona.api.data.primarydata.ontology.PrimaryDataMessageFromExt; -import edu.ie3.simona.api.data.primarydata.ontology.ProvidePrimaryData; +import edu.ie3.simona.api.ontology.primary.PrimaryDataMessageFromExt; +import edu.ie3.simona.api.ontology.primary.ProvidePrimaryData; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java index 7d2a042b..76c77b45 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java @@ -7,10 +7,10 @@ package edu.ie3.simona.api.data.connection; import edu.ie3.datamodel.models.result.ResultEntity; -import edu.ie3.simona.api.data.results.ontology.ProvideResultEntities; -import edu.ie3.simona.api.data.results.ontology.RequestResultEntities; -import edu.ie3.simona.api.data.results.ontology.ResultDataMessageFromExt; -import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt; +import edu.ie3.simona.api.ontology.results.ProvideResultEntities; +import edu.ie3.simona.api.ontology.results.RequestResultEntities; +import edu.ie3.simona.api.ontology.results.ResultDataMessageFromExt; +import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt; import java.util.List; import java.util.Map; import java.util.UUID; diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java index 0a75ac57..151ca668 100644 --- a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java +++ b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java @@ -6,8 +6,8 @@ package edu.ie3.simona.api.data.connection; -import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt; import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException; +import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt; import java.util.concurrent.LinkedBlockingQueue; /** diff --git a/src/main/java/edu/ie3/simona/api/data/ev/model/EvModel.java b/src/main/java/edu/ie3/simona/api/data/model/ev/EvModel.java similarity index 96% rename from src/main/java/edu/ie3/simona/api/data/ev/model/EvModel.java rename to src/main/java/edu/ie3/simona/api/data/model/ev/EvModel.java index 2ea3082d..04c1fd05 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/model/EvModel.java +++ b/src/main/java/edu/ie3/simona/api/data/model/ev/EvModel.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.model; +package edu.ie3.simona.api.data.model.ev; import java.util.UUID; import javax.measure.quantity.Energy; diff --git a/src/main/java/edu/ie3/simona/api/data/ontology/DataMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/DataMessageFromExt.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ontology/DataMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/DataMessageFromExt.java index 66a79ed9..14a0a5f5 100644 --- a/src/main/java/edu/ie3/simona/api/data/ontology/DataMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/DataMessageFromExt.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ontology; +package edu.ie3.simona.api.ontology; /** Data related messages that are sent from the external simulation to SIMONA */ public interface DataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/ontology/DataResponseMessageToExt.java b/src/main/java/edu/ie3/simona/api/ontology/DataResponseMessageToExt.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ontology/DataResponseMessageToExt.java rename to src/main/java/edu/ie3/simona/api/ontology/DataResponseMessageToExt.java index 2eb2f29c..a191eaf2 100644 --- a/src/main/java/edu/ie3/simona/api/data/ontology/DataResponseMessageToExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/DataResponseMessageToExt.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ontology; +package edu.ie3.simona.api.ontology; /** Data related messages that are sent from SIMONA to the external simulation */ public interface DataResponseMessageToExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/ontology/ScheduleDataServiceMessage.java b/src/main/java/edu/ie3/simona/api/ontology/ScheduleDataServiceMessage.java similarity index 77% rename from src/main/java/edu/ie3/simona/api/data/ontology/ScheduleDataServiceMessage.java rename to src/main/java/edu/ie3/simona/api/ontology/ScheduleDataServiceMessage.java index 029b840d..4cc0fc98 100644 --- a/src/main/java/edu/ie3/simona/api/data/ontology/ScheduleDataServiceMessage.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ScheduleDataServiceMessage.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ontology; +package edu.ie3.simona.api.ontology; -import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt; +import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt; import org.apache.pekko.actor.typed.ActorRef; public record ScheduleDataServiceMessage(ActorRef dataService) diff --git a/src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/em/EmDataMessageFromExt.java similarity index 76% rename from src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/em/EmDataMessageFromExt.java index a5ea688c..936e43a2 100644 --- a/src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/em/EmDataMessageFromExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.em.ontology; +package edu.ie3.simona.api.ontology.em; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.DataMessageFromExt; /** Messages that are sent from an external data simulation which provides em data to SIMONA. */ public interface EmDataMessageFromExt extends DataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataResponseMessageToExt.java b/src/main/java/edu/ie3/simona/api/ontology/em/EmDataResponseMessageToExt.java similarity index 75% rename from src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataResponseMessageToExt.java rename to src/main/java/edu/ie3/simona/api/ontology/em/EmDataResponseMessageToExt.java index 8f373132..23bd278a 100644 --- a/src/main/java/edu/ie3/simona/api/data/em/ontology/EmDataResponseMessageToExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/em/EmDataResponseMessageToExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.em.ontology; +package edu.ie3.simona.api.ontology.em; -import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt; +import edu.ie3.simona.api.ontology.DataResponseMessageToExt; /** Messages that are sent from SIMONA to the external simulation that needs em data. */ public interface EmDataResponseMessageToExt extends DataResponseMessageToExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/em/ontology/ProvideEmSetPointData.java b/src/main/java/edu/ie3/simona/api/ontology/em/ProvideEmSetPointData.java similarity index 92% rename from src/main/java/edu/ie3/simona/api/data/em/ontology/ProvideEmSetPointData.java rename to src/main/java/edu/ie3/simona/api/ontology/em/ProvideEmSetPointData.java index 3f2bb40b..330da4bf 100644 --- a/src/main/java/edu/ie3/simona/api/data/em/ontology/ProvideEmSetPointData.java +++ b/src/main/java/edu/ie3/simona/api/ontology/em/ProvideEmSetPointData.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.em.ontology; +package edu.ie3.simona.api.ontology.em; import edu.ie3.simona.api.data.model.em.EmSetPoint; import java.util.Map; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/ev/EvDataMessageFromExt.java similarity index 70% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/EvDataMessageFromExt.java index 2eb04bdf..a3c71012 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/EvDataMessageFromExt.java @@ -4,8 +4,8 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.DataMessageFromExt; public interface EvDataMessageFromExt extends DataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataResponseMessageToExt.java b/src/main/java/edu/ie3/simona/api/ontology/ev/EvDataResponseMessageToExt.java similarity index 74% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataResponseMessageToExt.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/EvDataResponseMessageToExt.java index 59a49503..b5ed6c4e 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/EvDataResponseMessageToExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/EvDataResponseMessageToExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; -import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt; +import edu.ie3.simona.api.ontology.DataResponseMessageToExt; /** Messages that are sent from SIMONA to the external ev simulation */ public interface EvDataResponseMessageToExt extends DataResponseMessageToExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideArrivingEvs.java b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideArrivingEvs.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideArrivingEvs.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/ProvideArrivingEvs.java index da9b5724..8ec7e1ff 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideArrivingEvs.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideArrivingEvs.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; -import edu.ie3.simona.api.data.ev.model.EvModel; +import edu.ie3.simona.api.data.model.ev.EvModel; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideCurrentPrices.java b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideCurrentPrices.java similarity index 92% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideCurrentPrices.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/ProvideCurrentPrices.java index 9688d621..24bfe58a 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideCurrentPrices.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideCurrentPrices.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideDepartingEvs.java b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideDepartingEvs.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideDepartingEvs.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/ProvideDepartingEvs.java index 4f1e5637..df71882b 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideDepartingEvs.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideDepartingEvs.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; -import edu.ie3.simona.api.data.ev.model.EvModel; +import edu.ie3.simona.api.data.model.ev.EvModel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideEvcsFreeLots.java b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideEvcsFreeLots.java similarity index 93% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideEvcsFreeLots.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/ProvideEvcsFreeLots.java index 29264570..b2e27129 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/ProvideEvcsFreeLots.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/ProvideEvcsFreeLots.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestCurrentPrices.java b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestCurrentPrices.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestCurrentPrices.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/RequestCurrentPrices.java index f16adfb9..6a158446 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestCurrentPrices.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestCurrentPrices.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; /** Request current charging prices per charging station. */ public record RequestCurrentPrices() implements EvDataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestDepartingEvs.java b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestDepartingEvs.java similarity index 92% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestDepartingEvs.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/RequestDepartingEvs.java index 7aabcb06..398277a4 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestDepartingEvs.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestDepartingEvs.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; import java.util.List; import java.util.Map; diff --git a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestEvcsFreeLots.java b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestEvcsFreeLots.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestEvcsFreeLots.java rename to src/main/java/edu/ie3/simona/api/ontology/ev/RequestEvcsFreeLots.java index b394f5b0..57d5f67b 100644 --- a/src/main/java/edu/ie3/simona/api/data/ev/ontology/RequestEvcsFreeLots.java +++ b/src/main/java/edu/ie3/simona/api/ontology/ev/RequestEvcsFreeLots.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.ev.ontology; +package edu.ie3.simona.api.ontology.ev; /** Request the number of free lots per charging station from SIMONA */ public record RequestEvcsFreeLots() implements EvDataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/primarydata/ontology/PrimaryDataMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/primary/PrimaryDataMessageFromExt.java similarity index 74% rename from src/main/java/edu/ie3/simona/api/data/primarydata/ontology/PrimaryDataMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/primary/PrimaryDataMessageFromExt.java index e7eb7ae6..529cb275 100644 --- a/src/main/java/edu/ie3/simona/api/data/primarydata/ontology/PrimaryDataMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/primary/PrimaryDataMessageFromExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.primarydata.ontology; +package edu.ie3.simona.api.ontology.primary; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.DataMessageFromExt; /** Messages that are sent from an external primary data simulation to SIMONA */ public interface PrimaryDataMessageFromExt extends DataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/primarydata/ontology/ProvidePrimaryData.java b/src/main/java/edu/ie3/simona/api/ontology/primary/ProvidePrimaryData.java similarity index 90% rename from src/main/java/edu/ie3/simona/api/data/primarydata/ontology/ProvidePrimaryData.java rename to src/main/java/edu/ie3/simona/api/ontology/primary/ProvidePrimaryData.java index 2c316323..9b3382df 100644 --- a/src/main/java/edu/ie3/simona/api/data/primarydata/ontology/ProvidePrimaryData.java +++ b/src/main/java/edu/ie3/simona/api/ontology/primary/ProvidePrimaryData.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.primarydata.ontology; +package edu.ie3.simona.api.ontology.primary; import edu.ie3.datamodel.models.value.Value; import java.util.Map; diff --git a/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java b/src/main/java/edu/ie3/simona/api/ontology/results/ProvideResultEntities.java similarity index 92% rename from src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java rename to src/main/java/edu/ie3/simona/api/ontology/results/ProvideResultEntities.java index 0c0d003f..722b4972 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ontology/ProvideResultEntities.java +++ b/src/main/java/edu/ie3/simona/api/ontology/results/ProvideResultEntities.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.results.ontology; +package edu.ie3.simona.api.ontology.results; import edu.ie3.datamodel.models.result.ResultEntity; import java.util.List; diff --git a/src/main/java/edu/ie3/simona/api/data/results/ontology/RequestResultEntities.java b/src/main/java/edu/ie3/simona/api/ontology/results/RequestResultEntities.java similarity index 89% rename from src/main/java/edu/ie3/simona/api/data/results/ontology/RequestResultEntities.java rename to src/main/java/edu/ie3/simona/api/ontology/results/RequestResultEntities.java index bc4dc37f..3a78c1fb 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ontology/RequestResultEntities.java +++ b/src/main/java/edu/ie3/simona/api/ontology/results/RequestResultEntities.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.results.ontology; +package edu.ie3.simona.api.ontology.results; import java.util.List; import java.util.UUID; diff --git a/src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/results/ResultDataMessageFromExt.java similarity index 74% rename from src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/results/ResultDataMessageFromExt.java index 83b2e318..53d822de 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/results/ResultDataMessageFromExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.results.ontology; +package edu.ie3.simona.api.ontology.results; -import edu.ie3.simona.api.data.ontology.DataMessageFromExt; +import edu.ie3.simona.api.ontology.DataMessageFromExt; /** Messages that are sent from an external simulation to the SIMONA */ public interface ResultDataMessageFromExt extends DataMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataResponseMessageToExt.java b/src/main/java/edu/ie3/simona/api/ontology/results/ResultDataResponseMessageToExt.java similarity index 75% rename from src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataResponseMessageToExt.java rename to src/main/java/edu/ie3/simona/api/ontology/results/ResultDataResponseMessageToExt.java index 311ff1f4..1a6a4116 100644 --- a/src/main/java/edu/ie3/simona/api/data/results/ontology/ResultDataResponseMessageToExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/results/ResultDataResponseMessageToExt.java @@ -4,9 +4,9 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.data.results.ontology; +package edu.ie3.simona.api.ontology.results; -import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt; +import edu.ie3.simona.api.ontology.DataResponseMessageToExt; /** Messages that are sent from SIMONA to the external simulation that needs results */ public interface ResultDataResponseMessageToExt extends DataResponseMessageToExt {} diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/ActivationMessage.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/ActivationMessage.java similarity index 88% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/ActivationMessage.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/ActivationMessage.java index f6b7f133..0b8784df 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/ActivationMessage.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/ActivationMessage.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; /** * Message that the external simulation is activated with by SIMONA diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/CompletionMessage.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/CompletionMessage.java similarity index 90% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/CompletionMessage.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/CompletionMessage.java index 35364c9b..ae8eb12e 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/CompletionMessage.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/CompletionMessage.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; import java.util.Optional; diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/ControlMessageToExt.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/ControlMessageToExt.java similarity index 86% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/ControlMessageToExt.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/ControlMessageToExt.java index 601b1624..b0de22f2 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/ControlMessageToExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/ControlMessageToExt.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; /** Interface for control messages from the SIMONA to the external simulation */ public interface ControlMessageToExt {} diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/ControlResponseMessageFromExt.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/ControlResponseMessageFromExt.java similarity index 86% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/ControlResponseMessageFromExt.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/ControlResponseMessageFromExt.java index f3df0973..418f69da 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/ControlResponseMessageFromExt.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/ControlResponseMessageFromExt.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; /** Interface for control messages from the external simulation to SIMONA */ public interface ControlResponseMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationCompleted.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationCompleted.java similarity index 87% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationCompleted.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationCompleted.java index c46ca045..35d4c90c 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationCompleted.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationCompleted.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; /** Message returned to SIMONA indicating that the external simulation terminated */ public record TerminationCompleted() implements ControlResponseMessageFromExt {} diff --git a/src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationMessage.java b/src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationMessage.java similarity index 90% rename from src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationMessage.java rename to src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationMessage.java index c281d041..d406129c 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ontology/TerminationMessage.java +++ b/src/main/java/edu/ie3/simona/api/ontology/simulation/TerminationMessage.java @@ -4,7 +4,7 @@ * Research group Distribution grid planning and operation */ -package edu.ie3.simona.api.simulation.ontology; +package edu.ie3.simona.api.ontology.simulation; /** * Message that is sent once SIMONA is terminating, indicating that the external simulation should diff --git a/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java b/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java index 59f81b1e..a1af39fa 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java +++ b/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java @@ -6,8 +6,8 @@ package edu.ie3.simona.api.simulation; -import edu.ie3.simona.api.simulation.ontology.ControlMessageToExt; -import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt; +import edu.ie3.simona.api.ontology.simulation.ControlMessageToExt; +import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt; import java.util.concurrent.LinkedBlockingQueue; import org.apache.pekko.actor.typed.ActorRef; diff --git a/src/main/java/edu/ie3/simona/api/simulation/ExtSimulation.java b/src/main/java/edu/ie3/simona/api/simulation/ExtSimulation.java index 71c1b98b..d1801907 100644 --- a/src/main/java/edu/ie3/simona/api/simulation/ExtSimulation.java +++ b/src/main/java/edu/ie3/simona/api/simulation/ExtSimulation.java @@ -7,7 +7,7 @@ package edu.ie3.simona.api.simulation; import edu.ie3.simona.api.data.connection.ExtDataConnection; -import edu.ie3.simona.api.simulation.ontology.*; +import edu.ie3.simona.api.ontology.simulation.*; import java.util.Optional; import java.util.Set; diff --git a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEmDataConnectionTest.groovy b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEmDataConnectionTest.groovy index b11d7b03..b9e9251a 100644 --- a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEmDataConnectionTest.groovy +++ b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEmDataConnectionTest.groovy @@ -2,9 +2,9 @@ package edu.ie3.simona.api.data.connection import edu.ie3.simona.api.data.connection.ExtEmDataConnection.EmMode import edu.ie3.simona.api.data.model.em.EmSetPoint -import edu.ie3.simona.api.data.ontology.DataMessageFromExt -import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage -import edu.ie3.simona.api.data.em.ontology.ProvideEmSetPointData +import edu.ie3.simona.api.ontology.DataMessageFromExt +import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage +import edu.ie3.simona.api.ontology.em.ProvideEmSetPointData import edu.ie3.simona.api.test.common.DataServiceTestData import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit import spock.lang.Shared diff --git a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEvDataConnectionTest.groovy b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEvDataConnectionTest.groovy index 581efacc..ac87c481 100644 --- a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEvDataConnectionTest.groovy +++ b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtEvDataConnectionTest.groovy @@ -1,9 +1,15 @@ package edu.ie3.simona.api.data.connection -import edu.ie3.simona.api.data.ev.model.EvModel -import edu.ie3.simona.api.data.ev.ontology.* -import edu.ie3.simona.api.data.ontology.DataMessageFromExt -import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage +import edu.ie3.simona.api.data.model.ev.EvModel +import edu.ie3.simona.api.ontology.DataMessageFromExt +import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage +import edu.ie3.simona.api.ontology.ev.ProvideArrivingEvs +import edu.ie3.simona.api.ontology.ev.ProvideCurrentPrices +import edu.ie3.simona.api.ontology.ev.ProvideDepartingEvs +import edu.ie3.simona.api.ontology.ev.ProvideEvcsFreeLots +import edu.ie3.simona.api.ontology.ev.RequestCurrentPrices +import edu.ie3.simona.api.ontology.ev.RequestDepartingEvs +import edu.ie3.simona.api.ontology.ev.RequestEvcsFreeLots import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit import spock.lang.Shared import spock.lang.Specification diff --git a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnectionTest.groovy b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnectionTest.groovy index 0cbb19c2..42012311 100644 --- a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnectionTest.groovy +++ b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnectionTest.groovy @@ -2,9 +2,9 @@ package edu.ie3.simona.api.data.connection import edu.ie3.datamodel.models.value.PValue import edu.ie3.datamodel.models.value.Value -import edu.ie3.simona.api.data.ontology.DataMessageFromExt -import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage -import edu.ie3.simona.api.data.primarydata.ontology.ProvidePrimaryData +import edu.ie3.simona.api.ontology.DataMessageFromExt +import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage +import edu.ie3.simona.api.ontology.primary.ProvidePrimaryData import edu.ie3.simona.api.test.common.DataServiceTestData import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit import spock.lang.Shared diff --git a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultDataConnectionTest.groovy b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultDataConnectionTest.groovy index 97cb81ba..c5d0b912 100644 --- a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultDataConnectionTest.groovy +++ b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultDataConnectionTest.groovy @@ -1,10 +1,10 @@ package edu.ie3.simona.api.data.connection -import edu.ie3.simona.api.data.ontology.DataMessageFromExt -import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage -import edu.ie3.simona.api.data.results.ontology.ProvideResultEntities -import edu.ie3.simona.api.data.results.ontology.RequestResultEntities -import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt +import edu.ie3.simona.api.ontology.DataMessageFromExt +import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage +import edu.ie3.simona.api.ontology.results.ProvideResultEntities +import edu.ie3.simona.api.ontology.results.RequestResultEntities +import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt import edu.ie3.simona.api.test.common.DataServiceTestData import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit import spock.lang.Shared diff --git a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultListenerTest.groovy b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultListenerTest.groovy index e90beb01..f38d7325 100644 --- a/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultListenerTest.groovy +++ b/src/test/groovy/edu/ie3/simona/api/data/connection/ExtResultListenerTest.groovy @@ -1,7 +1,7 @@ package edu.ie3.simona.api.data.connection import edu.ie3.datamodel.models.result.NodeResult -import edu.ie3.simona.api.data.results.ontology.ProvideResultEntities +import edu.ie3.simona.api.ontology.results.ProvideResultEntities import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException import edu.ie3.simona.api.test.common.DataServiceTestData import spock.lang.Specification diff --git a/src/test/groovy/edu/ie3/simona/api/simulation/ExtSimulationSpec.groovy b/src/test/groovy/edu/ie3/simona/api/simulation/ExtSimulationSpec.groovy index 56c2d129..c5292dd8 100644 --- a/src/test/groovy/edu/ie3/simona/api/simulation/ExtSimulationSpec.groovy +++ b/src/test/groovy/edu/ie3/simona/api/simulation/ExtSimulationSpec.groovy @@ -1,7 +1,12 @@ package edu.ie3.simona.api.simulation import edu.ie3.simona.api.data.connection.ExtDataConnection -import edu.ie3.simona.api.simulation.ontology.* +import edu.ie3.simona.api.ontology.simulation.ActivationMessage +import edu.ie3.simona.api.ontology.simulation.CompletionMessage +import edu.ie3.simona.api.ontology.simulation.ControlMessageToExt +import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt +import edu.ie3.simona.api.ontology.simulation.TerminationCompleted +import edu.ie3.simona.api.ontology.simulation.TerminationMessage import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit import spock.lang.Shared import spock.lang.Specification