Skip to content

Commit 257bfea

Browse files
authored
Merge pull request #370 from ie3-institute/ms/#368-adding-utility-methods
Adding utility methods
2 parents cd22541 + 6f432fa commit 257bfea

File tree

6 files changed

+55
-0
lines changed

6 files changed

+55
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
### Added
10+
- Adding some utility methods [#368](https://github.com/ie3-institute/simonaAPI/issues/368)
11+
912
### Changed
1013
- Changes to sent and received em data [#2366](https://github.com/ie3-institute/simonaAPI/issues/366)
1114

src/main/java/edu/ie3/simona/api/data/ExtDataContainerQueue.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ public int size() {
2121
return receiverTriggerDeque.size();
2222
}
2323

24+
/** Method for clearing this queue. */
25+
public void clear() {
26+
receiverTriggerDeque.clear();
27+
}
28+
2429
/**
2530
* Method for adding an {@link ExtDataContainer} to the queue.
2631
*

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException;
1010
import edu.ie3.simona.api.ontology.DataMessageFromExt;
1111
import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
12+
import java.util.ArrayList;
13+
import java.util.List;
1214
import java.util.concurrent.LinkedBlockingQueue;
1315

1416
/**
@@ -38,6 +40,13 @@ public final R receiveAny() throws InterruptedException {
3840
return receiveTriggerQueue.take();
3941
}
4042

43+
/** Returns all received responses. */
44+
public final List<R> receiveAll() {
45+
List<R> result = new ArrayList<>(receiveTriggerQueue.size());
46+
receiveTriggerQueue.drainTo(result);
47+
return result;
48+
}
49+
4150
@Override
4251
@SuppressWarnings("unchecked")
4352
public final <T extends R> T receiveWithType(Class<T> expectedMessageClass)

src/main/java/edu/ie3/simona/api/data/container/ExtInputContainer.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,24 @@ public String flexOptionsString() {
201201
public String setPointsString() {
202202
return setPoints.toString();
203203
}
204+
205+
@Override
206+
public String toString() {
207+
return "ExtInputContainer{"
208+
+ "tick="
209+
+ tick
210+
+ ", maybeNextTick="
211+
+ maybeNextTick
212+
+ ", primaryData="
213+
+ primaryData
214+
+ ", flexRequests="
215+
+ flexRequests
216+
+ ", flexOptions="
217+
+ flexOptions
218+
+ ", setPoints="
219+
+ setPoints
220+
+ ", emMessages="
221+
+ emMessages
222+
+ '}';
223+
}
204224
}

src/main/java/edu/ie3/simona/api/data/container/ExtOutputContainer.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,18 @@ public List<ResultEntity> getResult(UUID assetId) {
135135
public List<EmData> getEmData(UUID assetId) {
136136
return emDataMap.getOrDefault(assetId, Collections.emptyList());
137137
}
138+
139+
@Override
140+
public String toString() {
141+
return "ExtOutputContainer{"
142+
+ "tick="
143+
+ tick
144+
+ ", maybeNextTick="
145+
+ maybeNextTick
146+
+ ", resultMap="
147+
+ resultMap
148+
+ ", emDataMap="
149+
+ emDataMap
150+
+ '}';
151+
}
138152
}

src/main/java/edu/ie3/simona/api/ontology/results/ProvideResultEntities.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ public record ProvideResultEntities(Map<UUID, List<ResultEntity>> results)
1919
public ProvideResultEntities(List<ResultEntity> resultEntities) {
2020
this(resultEntities.stream().collect(Collectors.groupingBy(ResultEntity::getInputModel)));
2121
}
22+
23+
public ProvideResultEntities(ResultEntity result) {
24+
this(Map.of(result.getInputModel(), List.of(result)));
25+
}
2226
}

0 commit comments

Comments
 (0)