100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor model update
Rich Turnerd7df6366e048
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.javaindex b437c01c2..bf51f8f9a 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java@@ -67,7 +67,7 @@ public class WebsocketAgent extends IOAgent<WebsocketAgent, WebsocketAgentProtocreturn getAttributes().getValue(CONNECT_URL);}- public WebsocketAgent setConnectUri(String value) {+ public WebsocketAgent setConnectURI(String value) {getAttributes().getOrCreate(CONNECT_URL).setValue(value);return this;}diff --git a/model/src/main/java/org/openremote/model/value/ValueType.java b/model/src/main/java/org/openremote/model/value/ValueType.javaindex 863b45176..9b48a08db 100644--- a/model/src/main/java/org/openremote/model/value/ValueType.java+++ b/model/src/main/java/org/openremote/model/value/ValueType.java@@ -20,6 +20,7 @@package org.openremote.model.value;import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.BaseJsonNode;import com.fasterxml.jackson.databind.node.ObjectNode;import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;@@ -85,6 +86,8 @@ public final class ValueType {public static final ValueDescriptor<ObjectNode> JSON_OBJECT = new ValueDescriptor<>("JSONObject", ObjectNode.class);+ public static final ValueDescriptor<ArrayNode> JSON_ARRAY = new ValueDescriptor<>("JSONArray", ArrayNode.class);+public static final ValueDescriptor<BaseJsonNode> JSON = new ValueDescriptor<>("JSON", BaseJsonNode.class);public static final ValueDescriptor<Integer> POSITIVE_INTEGER = new ValueDescriptor<>("positiveInteger", Integer.class,diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovyindex 26d18f8ac..f869f9900 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy@@ -141,7 +141,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiand: "a Websocket client agent is created to connect to this tests manager"def agent = new WebsocketAgent("Test agent").setRealm(Constants.MASTER_REALM)- .setConnectUri("ws://127.0.0.1:$serverPort/websocket/events?Realm=master")+ .setConnectURI("ws://127.0.0.1:$serverPort/websocket/events?Realm=master").setOAuthGrant(new OAuthPasswordGrant("http://127.0.0.1:$serverPort/auth/realms/master/protocol/openid-connect/token",KEYCLOAK_CLIENT_ID,null,