Skip to content

Commit b6784df

Browse files
authored
Merge pull request #302 from ie3-institute/ms/#269-refactor-messages
Refactoring messages and models.
2 parents 9a2f537 + 6243f15 commit b6784df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+89
-76
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Adapted dependabot workflow and added CODEOWNERS [#294](https://github.com/ie3-institute/simonaAPI/issues/294)
1212
- Refactoring external data connection [#267](https://github.com/ie3-institute/simonaAPI/issues/267)
1313
- Refactoring data containers [#268](https://github.com/ie3-institute/simonaAPI/issues/268)
14+
- Refactoring messages [#269](https://github.com/ie3-institute/simonaAPI/issues/269)
15+
- Refactoring models [#270](https://github.com/ie3-institute/simonaAPI/issues/270)
1416

1517
## [0.9.0] - 2025-05-09
1618

src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
10-
import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
119
import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException;
10+
import edu.ie3.simona.api.ontology.DataMessageFromExt;
11+
import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
1212
import java.util.concurrent.LinkedBlockingQueue;
1313

1414
/**

src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.em.ontology.EmDataMessageFromExt;
10-
import edu.ie3.simona.api.data.em.ontology.EmDataResponseMessageToExt;
11-
import edu.ie3.simona.api.data.em.ontology.ProvideEmSetPointData;
129
import edu.ie3.simona.api.data.model.em.EmSetPoint;
10+
import edu.ie3.simona.api.ontology.em.EmDataMessageFromExt;
11+
import edu.ie3.simona.api.ontology.em.EmDataResponseMessageToExt;
12+
import edu.ie3.simona.api.ontology.em.ProvideEmSetPointData;
1313
import java.util.*;
1414
import org.slf4j.Logger;
1515

src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.ev.model.EvModel;
10-
import edu.ie3.simona.api.data.ev.ontology.*;
9+
import edu.ie3.simona.api.data.model.ev.EvModel;
10+
import edu.ie3.simona.api.ontology.ev.*;
1111
import java.util.List;
1212
import java.util.Map;
1313
import java.util.Optional;

src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
10-
import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage;
11-
import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
9+
import edu.ie3.simona.api.ontology.DataMessageFromExt;
10+
import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage;
11+
import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt;
1212
import org.apache.pekko.actor.typed.ActorRef;
1313

1414
/**

src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
9+
import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
1010

1111
/**
1212
* Interface for a connection between SIMONA and an external simulation with data flow from SIMONA

src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
package edu.ie3.simona.api.data.connection;
88

99
import edu.ie3.datamodel.models.value.Value;
10-
import edu.ie3.simona.api.data.primarydata.ontology.PrimaryDataMessageFromExt;
11-
import edu.ie3.simona.api.data.primarydata.ontology.ProvidePrimaryData;
10+
import edu.ie3.simona.api.ontology.primary.PrimaryDataMessageFromExt;
11+
import edu.ie3.simona.api.ontology.primary.ProvidePrimaryData;
1212
import java.util.List;
1313
import java.util.Map;
1414
import java.util.Optional;

src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
package edu.ie3.simona.api.data.connection;
88

99
import edu.ie3.datamodel.models.result.ResultEntity;
10-
import edu.ie3.simona.api.data.results.ontology.ProvideResultEntities;
11-
import edu.ie3.simona.api.data.results.ontology.RequestResultEntities;
12-
import edu.ie3.simona.api.data.results.ontology.ResultDataMessageFromExt;
13-
import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt;
10+
import edu.ie3.simona.api.ontology.results.ProvideResultEntities;
11+
import edu.ie3.simona.api.ontology.results.RequestResultEntities;
12+
import edu.ie3.simona.api.ontology.results.ResultDataMessageFromExt;
13+
import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt;
1414
import java.util.List;
1515
import java.util.Map;
1616
import java.util.UUID;

src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
package edu.ie3.simona.api.data.connection;
88

9-
import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt;
109
import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException;
10+
import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt;
1111
import java.util.concurrent.LinkedBlockingQueue;
1212

1313
/**

src/main/java/edu/ie3/simona/api/data/ev/model/EvModel.java renamed to src/main/java/edu/ie3/simona/api/data/model/ev/EvModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Research group Distribution grid planning and operation
55
*/
66

7-
package edu.ie3.simona.api.data.ev.model;
7+
package edu.ie3.simona.api.data.model.ev;
88

99
import java.util.UUID;
1010
import javax.measure.quantity.Energy;

0 commit comments

Comments
 (0)