Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix broken tests

Rich Turnerd3449d2776e6
diff --git a/client/src/main/java/org/openremote/app/client/event/EventServiceImpl.java b/client/src/main/java/org/openremote/app/client/event/EventServiceImpl.java
index 2da7daf69..4ffc4c6ae 100644
--- a/client/src/main/java/org/openremote/app/client/event/EventServiceImpl.java
+++ b/client/src/main/java/org/openremote/app/client/event/EventServiceImpl.java
@@ -123,17 +123,17 @@ public class EventServiceImpl implements EventService {
return;
if (data.startsWith(UnauthorizedEventSubscription.MESSAGE_PREFIX)) {
data = data.substring(UnauthorizedEventSubscription.MESSAGE_PREFIX.length());
- UnauthorizedEventSubscription failure = unauthorizedEventSubscriptionMapper.read(data);
+ UnauthorizedEventSubscription<?> failure = unauthorizedEventSubscriptionMapper.read(data);
eventBus.dispatch(new SubscriptionFailureEvent(failure.getSubscription().getEventType()));
} else if (data.startsWith(SharedEvent.MESSAGE_PREFIX)) {
data = data.substring(SharedEvent.MESSAGE_PREFIX.length());
if (data.startsWith("{")) {
- TriggeredEventSubscription triggered = triggeredEventSubscriptionMapper.read(data);
+ TriggeredEventSubscription<?> triggered = triggeredEventSubscriptionMapper.read(data);
if (triggered.getEvents() == null) {
SharedEvent event = sharedEventMapper.read(data);
eventBus.dispatch(event);
} else {
- Arrays.stream(triggered.getEvents()).forEach(eventBus::dispatch);
+ triggered.getEvents().forEach(eventBus::dispatch);
}
} else if (data.startsWith("[")) {
// Handle array of events
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 72550fcef..c2c9aea50 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -1910,19 +1910,19 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
List<String> names = attributeNames == null ? Collections.emptyList() : Arrays.asList(attributeNames);
// Client may want to read a subset or all attributes of the asset
- AttributeEvent[] events = asset.getAttributesStream()
+ List<AttributeEvent> events = asset.getAttributesStream()
.filter(attribute -> names.isEmpty() || attribute.getName().filter(names::contains).isPresent())
.map(AssetAttribute::getStateEvent)
.filter(Optional::isPresent)
.map(Optional::get)
- .toArray(AttributeEvent[]::new);
+ .collect(Collectors.toList());
TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(events, subscriptionId);
clientEventService.sendToSession(sessionKey, triggeredEventSubscription);
}
protected void replyWithAssetEvent(String sessionKey, String subscriptionId, Asset asset) {
AssetEvent event = new AssetEvent(AssetEvent.Cause.READ, asset, null);
- TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(new AssetEvent[]{event}, subscriptionId);
+ TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(Collections.singletonList(event), subscriptionId);
clientEventService.sendToSession(sessionKey, triggeredEventSubscription);
}
diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java
index 1cdaf805f..bd73eaeec 100644
--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java
+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java
@@ -199,8 +199,7 @@ public class EventSubscriptions {
if (sessionSubscription.subscription.getFilter() == null
|| sessionSubscription.subscription.getFilter().apply(event)) {
LOG.fine("Creating message for subscribed session '" + sessionKey + "': " + event);
- SharedEvent[] events = (SharedEvent[])Array.newInstance(event.getClass(), 1);
- events[0] = event;
+ List<SharedEvent> events = Collections.singletonList(event);
TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(events, sessionSubscription.subscriptionId);
if (sessionSubscription.subscription.getInternalConsumer() == null) {
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
index 4c3abd3c1..9df52afd8 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -211,7 +211,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
AssetEvent.class,
new AssetFilter<AssetEvent>().setRealm(connection.getLocalRealm()),
triggeredEventSubscription ->
- Arrays.stream(triggeredEventSubscription.getEvents())
+ triggeredEventSubscription.getEvents()
.forEach(event ->
sendCentralManagerMessage(connection.getLocalRealm(), messageFromSharedEvent(event)))));
@@ -222,7 +222,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
AttributeEvent.class,
new AssetFilter<AttributeEvent>().setRealm(connection.getLocalRealm()),
triggeredEventSubscription ->
- Arrays.stream(triggeredEventSubscription.getEvents())
+ triggeredEventSubscription.getEvents()
.forEach(event ->
sendCentralManagerMessage(connection.getLocalRealm(), messageFromSharedEvent(event)))));
diff --git a/model/src/main/java/org/openremote/model/event/TriggeredEventSubscription.java b/model/src/main/java/org/openremote/model/event/TriggeredEventSubscription.java
index 525461e81..f67bf24fc 100644
--- a/model/src/main/java/org/openremote/model/event/TriggeredEventSubscription.java
+++ b/model/src/main/java/org/openremote/model/event/TriggeredEventSubscription.java
@@ -24,19 +24,20 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.openremote.model.event.shared.SharedEvent;
import java.util.Arrays;
+import java.util.List;
public class TriggeredEventSubscription<T extends SharedEvent> {
- protected T[] events;
+ protected List<T> events;
protected String subscriptionId;
@JsonCreator
- public TriggeredEventSubscription(@JsonProperty("events") T[] events, @JsonProperty("subscriptionId") String subscriptionId) {
+ public TriggeredEventSubscription(@JsonProperty("events") List<T> events, @JsonProperty("subscriptionId") String subscriptionId) {
this.events = events;
this.subscriptionId = subscriptionId;
}
- public T[] getEvents() {
+ public List<T> getEvents() {
return events;
}
@@ -47,7 +48,7 @@ public class TriggeredEventSubscription<T extends SharedEvent> {
@Override
public String toString() {
return "TriggeredEventSubscription{" +
- "events=" + Arrays.toString(events) +
+ "events=" + Arrays.toString(events.toArray()) +
", subscriptionId='" + subscriptionId + '\'' +
'}';
}
diff --git a/model/src/main/java/org/openremote/model/gateway/GatewayDisconnectEvent.java b/model/src/main/java/org/openremote/model/gateway/GatewayDisconnectEvent.java
index 132ed28a6..2bd5161ba 100644
--- a/model/src/main/java/org/openremote/model/gateway/GatewayDisconnectEvent.java
+++ b/model/src/main/java/org/openremote/model/gateway/GatewayDisconnectEvent.java
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.openremote.model.event.shared.SharedEvent;
+import java.util.Date;
+
/**
* Used to indicate to a connected gateway should should disconnect
* with the {@link #reason} indicating why the disconnect has been
@@ -40,8 +42,8 @@ public class GatewayDisconnectEvent extends SharedEvent {
protected Reason reason;
@JsonCreator
- public GatewayDisconnectEvent(@JsonProperty("timestamp") long timestamp, @JsonProperty("reason") Reason reason) {
- super(timestamp);
+ public GatewayDisconnectEvent(@JsonProperty("timestamp") Date timestamp, @JsonProperty("reason") Reason reason) {
+ super(timestamp != null ? timestamp.getTime() : new Date().getTime());
this.reason = reason;
}
diff --git a/model/src/main/java/org/openremote/model/simulator/SimulatorState.java b/model/src/main/java/org/openremote/model/simulator/SimulatorState.java
index 88927e867..2f87c26f2 100644
--- a/model/src/main/java/org/openremote/model/simulator/SimulatorState.java
+++ b/model/src/main/java/org/openremote/model/simulator/SimulatorState.java
@@ -71,7 +71,6 @@ public class SimulatorState extends SharedEvent {
// This map can be populated to complete the simulator state with user-friendly names for each simulated AttributeRef
protected Map<String, String> assetIdAndName = new HashMap<>();
-
protected AttributeRef protocolConfigurationRef;
protected SimulatorElement[] elements = new SimulatorElement[0];
diff --git a/test/src/main/groovy/org/openremote/test/ClientEventService.groovy b/test/src/main/groovy/org/openremote/test/ClientEventService.groovy
index 44f86539c..7187fa8d5 100644
--- a/test/src/main/groovy/org/openremote/test/ClientEventService.groovy
+++ b/test/src/main/groovy/org/openremote/test/ClientEventService.groovy
@@ -22,6 +22,7 @@ package org.openremote.test
import com.fasterxml.jackson.databind.ObjectMapper
import org.openremote.app.client.event.SubscriptionFailureEvent
import org.openremote.app.client.event.EventService
+import org.openremote.model.event.Event
import org.openremote.model.event.TriggeredEventSubscription
import org.openremote.model.event.bus.EventBus
import org.openremote.model.event.shared.*
@@ -60,9 +61,7 @@ class ClientEventService implements EventService {
if (data.startsWith("{")) {
TriggeredEventSubscription event = objectMapper.readValue(data, TriggeredEventSubscription.class)
if (event.events != null) {
- for (SharedEvent evt : event.events) {
- eventBus.dispatch(evt)
- }
+ event.events.forEach{ Event evt -> eventBus.dispatch(evt)}
}
} else if (data.startsWith("[")) {
// Handle array of events
diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
index d5e187b71..1aea3769b 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
@@ -128,7 +128,7 @@ class WebsocketClientTest extends Specification implements ManagerContainerTrait
assert lastMessage.indexOf(SharedEvent.MESSAGE_PREFIX) == 0
def triggeredEvent = Container.JSON.readValue(lastMessage.substring(SharedEvent.MESSAGE_PREFIX.length()), TriggeredEventSubscription.class)
assert triggeredEvent.subscriptionId == "1"
- assert triggeredEvent.events.length == 1
+ assert triggeredEvent.events.size() == 1
assert ((AttributeEvent)triggeredEvent.events[0]).entityId == managerDemoSetup.apartment1LivingroomId
assert ((AttributeEvent)triggeredEvent.events[0]).attributeName == "targetTemperature"
assert ((AttributeEvent)triggeredEvent.events[0]).value.flatMap{Values.getNumber(it)}.orElse(0) == 5