Skip to content

armgit / core

Public Imported from GitHub
0

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

Renamed Values to ValueUtil

Rich Turner93fe61388cfc
diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetProtocol.java
index 112378cbb..0e7c7dda2 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetProtocol.java
@@ -148,7 +148,7 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
// Map<String, Integer> valuesToUpdate = new LinkedHashMap<>();
// for(String requiredKey : updatedLight.getRequiredValues()) {
// try {
-// JsonNode node = Values.JSON.readTree(processedValue.toJson());
+// JsonNode node = ValueUtil.JSON.readTree(processedValue.toJson());
// JsonNode requiredKeyValue = node.get(requiredKey);
// if(requiredKeyValue == null)
// throw new NullPointerException("Could not find key: " + requiredKey + " in the json-file.");
@@ -162,7 +162,7 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
// //UPDATE DIM
// else if(event.getAttributeRef().getAttributeName().equalsIgnoreCase("Dim")) {
// try {
-// JsonNode node = Values.JSON.readTree(processedValue.toJson());
+// JsonNode node = ValueUtil.JSON.readTree(processedValue.toJson());
// int dimValue = node.asInt();
// updateLightStateInMemory(lightId, new ArtnetLightState(lightId, oldLightState.getReceivedValues(), dimValue, oldLightState.isEnabled()));
// } catch (JsonProcessingException e) {
@@ -172,7 +172,7 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
// //UPDATE ENABLED/DISABLED
// else if(event.getAttributeRef().getAttributeName().equalsIgnoreCase("Switch")) {
// try{
-// JsonNode node = Values.JSON.readTree(processedValue.toJson());
+// JsonNode node = ValueUtil.JSON.readTree(processedValue.toJson());
// boolean enabled = node.asBoolean();
// updateLightStateInMemory(lightId, new ArtnetLightState(lightId, oldLightState.getReceivedValues(), oldLightState.getDim(), enabled));
// } catch (JsonProcessingException e) {
@@ -196,7 +196,7 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
//
// String jsonString;
// jsonString = new String(fileData);
-// ObjectMap lightsObjectNode = Values.convert(ObjectNode.class, jsonString);
+// ObjectMap lightsObjectNode = ValueUtil.convert(ObjectNode.class, jsonString);
// List<ArtnetLight> newLights = parseArtnetLightsFromImport(lightsObjectNode);
// syncLightsToMemory(newLights);
// assetConsumer.accept(syncLightsToAssets(newLights, protocolConfiguration));
@@ -283,12 +283,12 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
// for(String key : updatedLight.getRequiredValues())
// values.put(key, 0);
// List<Attribute<?>> artNetLightAttributes = Arrays.asList(
-// new Attribute<>("Id", NUMBER, Values.create(updatedLight.getLightId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("GroupId", NUMBER, Values.create(updatedLight.getGroupId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("Universe", NUMBER, Values.create(updatedLight.getUniverse())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("AmountOfLeds", NUMBER, Values.create(updatedLight.getAmountOfLeds())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("RequiredValues", STRING, Values.create(String.join(",", updatedLight.getRequiredValues()))).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("Values", OBJECT, Values.parseOrNull(Values.JSON.writeValueAsString(values))).addMeta(
+// new Attribute<>("Id", NUMBER, ValueUtil.create(updatedLight.getLightId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("GroupId", NUMBER, ValueUtil.create(updatedLight.getGroupId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("Universe", NUMBER, ValueUtil.create(updatedLight.getUniverse())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("AmountOfLeds", NUMBER, ValueUtil.create(updatedLight.getAmountOfLeds())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("RequiredValues", STRING, ValueUtil.create(String.join(",", updatedLight.getRequiredValues()))).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("ValueUtil", OBJECT, ValueUtil.parseOrNull(ValueUtil.JSON.writeValueAsString(values))).addMeta(
// new MetaItem<>(AGENT_LINK, new AttributeRef(parentAgent.getId(), agentProtocolConfigName).toArrayValue())
// ),
// new Attribute<>("Switch", BOOLEAN, true).addMeta(
@@ -351,11 +351,11 @@ public class ArtnetProtocol extends AbstractIOClientProtocol<ArtnetProtocol, Art
// for(String key : light.getRequiredValues())
// values.put(key, 0);
// List<Attribute<?>> artNetLightAttributes = Arrays.asList(
-// new Attribute<>("Id", NUMBER, Values.create(light.getLightId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("GroupId", NUMBER, Values.create(light.getGroupId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("Universe", NUMBER, Values.create(light.getUniverse())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("AmountOfLeds", NUMBER, Values.create(light.getAmountOfLeds())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
-// new Attribute<>("RequiredValues", STRING, Values.create(String.join(",", light.getRequiredValues()))).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("Id", NUMBER, ValueUtil.create(light.getLightId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("GroupId", NUMBER, ValueUtil.create(light.getGroupId())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("Universe", NUMBER, ValueUtil.create(light.getUniverse())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("AmountOfLeds", NUMBER, ValueUtil.create(light.getAmountOfLeds())).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
+// new Attribute<>("RequiredValues", STRING, ValueUtil.create(String.join(",", light.getRequiredValues()))).addMeta(new Meta(new MetaItem<>(READ_ONLY, true))),
// new Attribute<>("Values", OBJECT, Values.parseOrNull(Values.JSON.writeValueAsString(values))).addMeta(
// new MetaItem<>(AGENT_LINK, new AttributeRef(parentAgent.getId(), agentProtocolConfigName).toArrayValue())
// ),
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
index 83765ddd3..0ce031eec 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
@@ -37,8 +37,8 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.AttributeState;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueDescriptor;
-import org.openremote.model.value.Values;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.core.MultivaluedMap;
@@ -237,7 +237,7 @@ public class ControllerProtocol extends AbstractProtocol<ControllerAgent, Contro
if (controllerCommand instanceof ControllerCommandBasic) {
body = event.getValue().map(v -> {
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
objectValue.putPOJO("parameter", processedValue);
return objectValue.toString();
}).orElse(null);
@@ -376,15 +376,15 @@ public class ControllerProtocol extends AbstractProtocol<ControllerAgent, Contro
LOG.info("### New sensors status received");
LOG.finer("### Polling request body response : " + responseBodyAsString);
- ArrayNode statusArray = Values.convert(responseBodyAsString, ArrayNode.class);
+ ArrayNode statusArray = ValueUtil.convert(responseBodyAsString, ArrayNode.class);
if (statusArray == null) {
LOG.warning("### Polling response is not a JSON array or empty: " + responseBodyAsString);
} else {
statusArray.forEach(status -> {
- String name = Optional.ofNullable(status.get("name")).flatMap(Values::getString).orElse(null);
- String value = Optional.ofNullable(status.get("value")).flatMap(Values::getString).orElse(null);
+ String name = Optional.ofNullable(status.get("name")).flatMap(ValueUtil::getString).orElse(null);
+ String value = Optional.ofNullable(status.get("value")).flatMap(ValueUtil::getString).orElse(null);
/**
* For every sensors in the request body, find the linked attributeref and update value by calling {@link #updateAttributeValue}
@@ -413,7 +413,7 @@ public class ControllerProtocol extends AbstractProtocol<ControllerAgent, Contro
private void updateAttributeValue(AttributeRef attributeRef, String value) {
LOG.finest("### Updating attribute " + attributeRef + " with value " + value);
ValueDescriptor<?> valueType = this.linkedAttributes.get(attributeRef).getType();
- Object valueObj = Values.convert(value, valueType.getType());
+ Object valueObj = ValueUtil.convert(value, valueType.getType());
this.updateLinkedAttribute(new AttributeState(attributeRef, valueObj));
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java
index 564d51278..55bbb89f4 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java
@@ -37,8 +37,8 @@ import org.openremote.model.auth.OAuthGrant;
import org.openremote.model.auth.UsernamePassword;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.client.Entity;
@@ -543,7 +543,7 @@ public class HTTPProtocol extends AbstractProtocol<HTTPAgent, HTTPAgentLink> {
protected void executeAttributeWriteRequest(HttpClientRequest clientRequest,
Object attributeValue,
Consumer<Response> responseConsumer) {
- String valueStr = attributeValue == null ? null : Values.convert(attributeValue, String.class);
+ String valueStr = attributeValue == null ? null : ValueUtil.convert(attributeValue, String.class);
Response response = null;
try {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/TypeMapper.java b/agent/src/main/java/org/openremote/agent/protocol/knx/TypeMapper.java
index 97bcc7591..e8a5649dd 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/knx/TypeMapper.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/TypeMapper.java
@@ -1,10 +1,10 @@
package org.openremote.agent.protocol.knx;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueDescriptor;
import org.openremote.model.value.ValueType;
import org.openremote.model.value.impl.ColourRGB;
-import org.openremote.model.value.Values;
import tuwien.auto.calimero.datapoint.Datapoint;
import tuwien.auto.calimero.dptxlator.*;
@@ -148,12 +148,12 @@ public class TypeMapper {
return translator;
}
- if (translator instanceof DPTXlatorBoolean && Values.isBoolean(value.getClass())) {
- ((DPTXlatorBoolean) translator).setValue(Values.getBoolean(value).orElse(false));
- } else if (translator instanceof DPTXlator8BitUnsigned && Values.isNumber(value.getClass())) {
- ((DPTXlator8BitUnsigned) translator).setValue(Values.getIntegerCoerced(value).orElse(0));
+ if (translator instanceof DPTXlatorBoolean && ValueUtil.isBoolean(value.getClass())) {
+ ((DPTXlatorBoolean) translator).setValue(ValueUtil.getBoolean(value).orElse(false));
+ } else if (translator instanceof DPTXlator8BitUnsigned && ValueUtil.isNumber(value.getClass())) {
+ ((DPTXlator8BitUnsigned) translator).setValue(ValueUtil.getIntegerCoerced(value).orElse(0));
} else if (translator instanceof DPTXlatorRGB) {
- ColourRGB colorRGB = Values.convert(value, ColourRGB.class);
+ ColourRGB colorRGB = ValueUtil.convert(value, ColourRGB.class);
if (colorRGB != null) {
((DPTXlatorRGB) translator).setValue(colorRGB.getR(), colorRGB.getG(), colorRGB.getB());
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
index 666bf5775..952b90d56 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
@@ -28,8 +28,8 @@ import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.ArrayList;
import java.util.List;
@@ -98,7 +98,7 @@ public class SerialProtocol extends AbstractSerialProtocol<SerialProtocol, Seria
if (attribute.getType().equals(ValueType.EXECUTION_STATUS)) {
AttributeExecuteStatus status = event.getValue()
- .flatMap(Values::getString)
+ .flatMap(ValueUtil::getString)
.flatMap(AttributeExecuteStatus::fromString)
.orElse(null);
@@ -108,6 +108,6 @@ public class SerialProtocol extends AbstractSerialProtocol<SerialProtocol, Seria
}
}
- return Values.convert(processedValue, String.class);
+ return ValueUtil.convert(processedValue, String.class);
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPProtocol.java
index 51a134237..2f4929ff4 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPProtocol.java
@@ -11,7 +11,7 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.AttributeState;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import org.snmp4j.PDU;
import java.util.HashMap;
@@ -74,7 +74,7 @@ public class SNMPProtocol extends AbstractProtocol<SNMPAgent, SNMPAgentLink> {
AttributeRef wildCardAttributeRef;
if ((wildCardAttributeRef = oidMap.get("*")) != null) {
- ObjectNode wildCardValue = Values.createJsonObject();
+ ObjectNode wildCardValue = ValueUtil.createJsonObject();
pdu.getVariableBindings().forEach(variableBinding -> {
wildCardValue.put(variableBinding.getOid().format(), variableBinding.toValueString());
});
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPProtocol.java
index a72e30f17..b194ca15f 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPProtocol.java
@@ -27,7 +27,7 @@ import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.Pair;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.ArrayList;
import java.util.List;
@@ -95,6 +95,6 @@ public class TCPProtocol extends AbstractTCPClientProtocol<TCPProtocol, TCPAgent
@Override
protected String createWriteMessage(Attribute<?> attribute, DefaultAgentLink agentLink, AttributeEvent event, Object processedValue) {
- return Values.convert(processedValue, String.class);
+ return ValueUtil.convert(processedValue, String.class);
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriConnection.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriConnection.java
index 0f433970c..3858a61b3 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriConnection.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriConnection.java
@@ -11,8 +11,8 @@ import org.openremote.model.asset.impl.LightAsset;
import org.openremote.model.asset.impl.PlugAsset;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.impl.ColourRGB;
-import org.openremote.model.value.Values;
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Consumer;
@@ -159,20 +159,20 @@ public class TradfriConnection {
Light light = device.toLight();
if (event.getAttributeName().equals(LightAsset.BRIGHTNESS.getName())) {
- int value = Values.getInteger(event.getValue()).orElse(0);
+ int value = ValueUtil.getInteger(event.getValue()).orElse(0);
light.setBrightness(convertBrightness(value, false));
} else if (event.getAttributeName().equals(LightAsset.ON_OFF.getName())) {
- light.setOn(Values.getBooleanCoerced(event.getValue()).orElse(false));
+ light.setOn(ValueUtil.getBooleanCoerced(event.getValue()).orElse(false));
} else if (event.getAttributeName().equals(LightAsset.COLOUR_RGB.getName())) {
- light.setColour(Values.convert(event.getValue(), ColourRGB.class));
+ light.setColour(ValueUtil.convert(event.getValue(), ColourRGB.class));
} else if (event.getAttributeName().equals(LightAsset.COLOUR_TEMPERATURE.getName())) {
- light.setColourTemperature(Values.getInteger(event.getValue()).orElse(0));
+ light.setColourTemperature(ValueUtil.getInteger(event.getValue()).orElse(0));
}
}
else if (device.isPlug()) {
Plug plug = device.toPlug();
if (event.getAttributeName().equals(PlugAsset.ON_OFF.getName())) {
- plug.setOn(Values.getBooleanCoerced(event.getValue()).orElse(false));
+ plug.setOn(ValueUtil.getBooleanCoerced(event.getValue()).orElse(false));
}
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
index 29fc3493c..506290a8c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.openremote.agent.protocol.tradfri.device.event.*;
import org.openremote.agent.protocol.tradfri.payload.DeviceResponse;
import org.openremote.agent.protocol.tradfri.util.CoapClient;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.ArrayList;
@@ -22,7 +22,7 @@ public class DeviceObserver extends Observer {
/**
* An object mapper used for mapping JSON responses from the IKEA TRÅDFRI gateway to Java classes
*/
- private final ObjectMapper objectMapper = Values.JSON;
+ private final ObjectMapper objectMapper = ValueUtil.JSON;
/**
* Construct the DeviceObserver class
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java
index 65f16ac2c..f76b7f902 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java
@@ -13,7 +13,7 @@ import org.eclipse.californium.core.network.EndpointManager;
import org.eclipse.californium.scandium.DTLSConnector;
import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
import org.eclipse.californium.scandium.dtls.pskstore.InMemoryPskStore;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -23,7 +23,7 @@ import java.net.InetSocketAddress;
*/
public class CoapClient {
- private final ObjectMapper objectMapper = Values.JSON;
+ private final ObjectMapper objectMapper = ValueUtil.JSON;
/**
* The credentials used to authenticate the CoAP client to the IKEA TRÅDFRI gateway
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPProtocol.java
index fa85beec7..a70a698f5 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPProtocol.java
@@ -27,7 +27,7 @@ import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.Pair;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.ArrayList;
import java.util.List;
@@ -92,6 +92,6 @@ public class UDPProtocol extends AbstractUDPProtocol<UDPProtocol, UDPAgent, Defa
@Override
protected String createWriteMessage(Attribute<?> attribute, DefaultAgentLink agentLink, AttributeEvent event, Object processedValue) {
- return Values.convert(processedValue, String.class);
+ return ValueUtil.convert(processedValue, String.class);
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
index 822ca6760..bfb510a82 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
@@ -22,9 +22,9 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueDescriptor;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.*;
import java.util.regex.Pattern;
@@ -167,7 +167,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_LOCKED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(locked -> {
params[2] = 0xFFFFFF;
return locked ? LOCK : LOCK_CANCEL;
@@ -175,7 +175,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(locked -> {
params[2] = 0xFFFFFF;
return locked ? FORCE_ON : FORCE_ON_CANCEL;
@@ -183,7 +183,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBITED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[2] = 0xFFFFFF;
return inhibited ? INHIBIT : INHIBIT_CANCEL;
@@ -202,7 +202,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
break;
case "_VALUE":
case "_LEVEL":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(level -> {
params[0] = level;
return level < 0 ? SET_LEVEL_HALT : channelNumberAndPropertySuffix.value.equals("_VALUE") ? SET_VALUE : SET_LEVEL;
@@ -211,7 +211,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
break;
case "_LOCK":
case "_FORCE_OFF":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[2] = duration;
return duration == 0 ? LOCK_CANCEL : LOCK;
@@ -219,7 +219,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_ON":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[2] = duration;
if (duration == 0) {
@@ -232,7 +232,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCE_ON":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[2] = duration;
return duration == 0 ? FORCE_ON_CANCEL : FORCE_ON;
@@ -240,7 +240,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBIT":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[2] = duration;
return duration == 0 ? INHIBIT_CANCEL : INHIBIT;
@@ -410,8 +410,8 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
return Optional.empty();
}
- if (Values.isString(value.getClass())) {
- return Values.getString(value)
+ if (ValueUtil.isString(value.getClass())) {
+ return ValueUtil.getString(value)
.map(levelSpeedStr -> {
String[] levelSpeedArr = levelSpeedStr.split("(?<=\\d):(?=\\d)");
if (levelSpeedArr.length == 2) {
@@ -423,20 +423,20 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
});
}
- if (Values.isArray(value.getClass())) {
- return Values.asJSONArray(value)
+ if (ValueUtil.isArray(value.getClass())) {
+ return ValueUtil.asJSONArray(value)
.map(arr -> {
- Optional<Integer> level = Values.getIntegerCoerced(arr.get(0));
- Optional<Integer> speed = Values.getIntegerCoerced(arr.get(1));
+ Optional<Integer> level = ValueUtil.getIntegerCoerced(arr.get(0));
+ Optional<Integer> speed = ValueUtil.getIntegerCoerced(arr.get(1));
return level.isPresent() && speed.isPresent() ? new Pair<>(level.get(), speed.get()) : null;
});
}
- if (Values.isObject(value.getClass())) {
- return Values.asJSONObject(value)
+ if (ValueUtil.isObject(value.getClass())) {
+ return ValueUtil.asJSONObject(value)
.map(obj -> {
- Optional<Integer> level = Values.getIntegerCoerced(obj.get("level"));
- Optional<Integer> speed = Values.getIntegerCoerced(obj.get("speed"));
+ Optional<Integer> level = ValueUtil.getIntegerCoerced(obj.get("level"));
+ Optional<Integer> speed = ValueUtil.getIntegerCoerced(obj.get("speed"));
return level.isPresent() && speed.isPresent() ? new Pair<>(level.get(), speed.get()) : null;
});
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
index f23dba299..d4b3ee08c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
@@ -22,9 +22,9 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueDescriptor;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,8 +47,8 @@ public class BlindProcessor extends OutputChannelProcessor {
return Optional.of(HALT);
}
- if (Values.isBoolean(value.getClass())) {
- return fromBoolean(Values.getBoolean(value).orElse(null));
+ if (ValueUtil.isBoolean(value.getClass())) {
+ return fromBoolean(ValueUtil.getBoolean(value).orElse(null));
}
return EnumUtil.enumFromValue(ChannelState.class, value);
@@ -227,7 +227,7 @@ public class BlindProcessor extends OutputChannelProcessor {
}
break;
case "_LOCKED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(locked -> {
params[0] = 0xFFFFFF;
return locked ? LOCK : LOCK_CANCEL;
@@ -235,7 +235,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBITED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? INHIBIT : INHIBIT_CANCEL;
@@ -243,7 +243,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBITED_UP":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? BLIND_INHIBIT_UP : INHIBIT_CANCEL;
@@ -252,7 +252,7 @@ public class BlindProcessor extends OutputChannelProcessor {
break;
case "_INHIBITED_DOWN":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? BLIND_INHIBIT_DOWN : INHIBIT_CANCEL;
@@ -260,7 +260,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCED_DOWN":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? BLIND_FORCE_DOWN : BLIND_FORCE_DOWN_CANCEL;
@@ -268,7 +268,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCED_UP":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? BLIND_FORCE_UP : BLIND_FORCE_UP_CANCEL;
@@ -276,7 +276,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_POSITION":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(position -> {
params[1] = position;
return position < 0 ? BLIND_HALT : BLIND_POSITION;
@@ -284,7 +284,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_LOCK":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? BLIND_LOCK_CANCEL : BLIND_LOCK;
@@ -292,7 +292,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_UP":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
if (duration == 0) {
@@ -304,7 +304,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_DOWN":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
if (duration == 0) {
@@ -316,7 +316,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCE_UP":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? BLIND_FORCE_UP_CANCEL : BLIND_FORCE_UP;
@@ -324,7 +324,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCE_DOWN":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? BLIND_FORCE_DOWN_CANCEL : BLIND_FORCE_DOWN;
@@ -332,7 +332,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBIT":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? INHIBIT_CANCEL : INHIBIT;
@@ -340,7 +340,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBIT_UP":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? INHIBIT_CANCEL : BLIND_INHIBIT_UP;
@@ -348,7 +348,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBIT_DOWN":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? INHIBIT_CANCEL : BLIND_INHIBIT_DOWN;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
index c33dacfc4..88e82ddc6 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.attribute.AttributeExecuteStatus;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Arrays;
import java.util.Collections;
@@ -113,7 +113,7 @@ public class CounterProcessor extends FeatureProcessor {
return null;
}
- return Values.getValueCoerced(value, AttributeExecuteStatus.class).map(attributeExecuteStatus -> {
+ return ValueUtil.getValueCoerced(value, AttributeExecuteStatus.class).map(attributeExecuteStatus -> {
if (attributeExecuteStatus != AttributeExecuteStatus.REQUEST_START) {
return null;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/InputProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/InputProcessor.java
index 34329421d..8835bee73 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/InputProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/InputProcessor.java
@@ -23,7 +23,7 @@ import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.util.Pair;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.*;
@@ -82,8 +82,8 @@ public class InputProcessor extends ChannelProcessor {
return Optional.empty();
}
- if (Values.isBoolean(value.getClass())) {
- return fromBoolean(Values.getBoolean(value).orElse(null));
+ if (ValueUtil.isBoolean(value.getClass())) {
+ return fromBoolean(ValueUtil.getBoolean(value).orElse(null));
}
return EnumUtil.enumFromValue(ChannelState.class, value);
@@ -211,11 +211,11 @@ public class InputProcessor extends ChannelProcessor {
);
break;
case LOCK_STATE:
- Values.getBoolean(value)
+ ValueUtil.getBoolean(value)
.ifPresent(locked -> packets.addAll(getLockStatePackets(device, channelNumber, locked ? -1 : 0)));
break;
case LOCK_DURATION:
- Values.getIntegerCoerced(value)
+ ValueUtil.getIntegerCoerced(value)
.ifPresent(
duration -> {
packets.addAll(getLockStatePackets(device, channelNumber, duration));
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OLEDProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OLEDProcessor.java
index 5358f6138..a72aae3ee 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OLEDProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OLEDProcessor.java
@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -50,7 +50,7 @@ public class OLEDProcessor extends FeatureProcessor {
@Override
public List<VelbusPacket> getPropertyWritePackets(VelbusDevice device, String property, Object value) {
if (property.equals("MEMO_TEXT")) {
- return Values.getString(value)
+ return ValueUtil.getString(value)
.map(text -> {
if (text.length() == 0) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
index 86be7fcc3..8fa36d411 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
@@ -20,7 +20,6 @@
package org.openremote.agent.protocol.velbus.device;
import org.openremote.model.util.EnumUtil;
-import org.openremote.model.value.Values;
import java.util.Optional;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ProgramsProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ProgramsProcessor.java
index f8895ce7f..cf2e089fb 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ProgramsProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ProgramsProcessor.java
@@ -22,8 +22,8 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.*;
import java.util.logging.Level;
@@ -119,11 +119,11 @@ public class ProgramsProcessor extends ChannelProcessor {
if (channelNumberAndPropertySuffix.isPresent()) {
switch (channelNumberAndPropertySuffix.get().value) {
case PROGRAM_STEPS_ENABLED_SUFFIX:
- return Values.getBooleanCoerced(value)
+ return ValueUtil.getBooleanCoerced(value)
.map(enabled -> getProgramStepsPackets(device, channelNumberAndPropertySuffix.get().key, enabled, 0xFFFFF))
.orElse(null);
case PROGRAM_STEPS_DISABLED_SECONDS_SUFFIX:
- return Values.getIntegerCoerced(value)
+ return ValueUtil.getIntegerCoerced(value)
.map(durationSeconds -> getProgramStepsPackets(device, channelNumberAndPropertySuffix.get().key, false, durationSeconds))
.orElse(null);
}
@@ -131,13 +131,13 @@ public class ProgramsProcessor extends ChannelProcessor {
}
if (property.equals("ALL" + PROGRAM_STEPS_ENABLED_SUFFIX)) {
- return Values.getBooleanCoerced(value)
+ return ValueUtil.getBooleanCoerced(value)
.map(enabled -> getProgramStepsPackets(device, 0xFF, enabled, 0xFFFFF))
.orElse(null);
}
if (property.equals("ALL" + PROGRAM_STEPS_DISABLED_SECONDS_SUFFIX)) {
- return Values.getIntegerCoerced(value)
+ return ValueUtil.getIntegerCoerced(value)
.map(durationSeconds -> getProgramStepsPackets(device, 0xFF, false, durationSeconds))
.orElse(null);
}
@@ -153,7 +153,7 @@ public class ProgramsProcessor extends ChannelProcessor {
}
if (property.equals("SUNRISE_ENABLED") || property.equals("SUNSET_ENABLED")) {
- return Values.getBooleanCoerced(value)
+ return ValueUtil.getBooleanCoerced(value)
.map(enabled -> {
boolean sunriseEnabled = device.getPropertyValue("SUNRISE_ENABLED") != null && ((Boolean)device.getPropertyValue("SUNRISE_ENABLED"));
boolean sunsetEnabled = device.getPropertyValue("SUNSET_ENABLED") != null && ((Boolean)device.getPropertyValue("SUNSET_ENABLED"));
@@ -218,7 +218,7 @@ public class ProgramsProcessor extends ChannelProcessor {
boolean isGlobal = Optional.ofNullable((Boolean)device.getPropertyValue(alarmMasterProperty)).orElse(false);
if ("ENABLED".equals(alarmProperty)) {
- Optional<Boolean> setEnabled = Values.getBooleanCoerced(value);
+ Optional<Boolean> setEnabled = ValueUtil.getBooleanCoerced(value);
if (!setEnabled.isPresent()) {
return null;
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
index 6e54aeab0..e654895d1 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Arrays;
import java.util.Collections;
@@ -65,8 +65,8 @@ public class RelayProcessor extends OutputChannelProcessor {
return Optional.empty();
}
- if (Values.isBoolean(value.getClass())) {
- return fromBoolean(Values.getBoolean(value).orElse(null));
+ if (ValueUtil.isBoolean(value.getClass())) {
+ return fromBoolean(ValueUtil.getBoolean(value).orElse(null));
}
return EnumUtil.enumFromValue(ChannelState.class, value);
@@ -207,7 +207,7 @@ public class RelayProcessor extends OutputChannelProcessor {
}
break;
case "_LOCKED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(locked -> {
params[0] = 0xFFFFFF;
return locked ? LOCK : LOCK_CANCEL;
@@ -215,7 +215,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBITED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? INHIBIT : INHIBIT_CANCEL;
@@ -223,7 +223,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCED":
- command = Values.getBoolean(value)
+ command = ValueUtil.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
return inhibited ? FORCE_ON : FORCE_ON_CANCEL;
@@ -231,7 +231,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_ON":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? RELAY_OFF : RELAY_ON_TIMER;
@@ -239,7 +239,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INTERMITTENT":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? RELAY_OFF : RELAY_BLINK_TIMER;
@@ -248,7 +248,7 @@ public class RelayProcessor extends OutputChannelProcessor {
break;
case "_LOCK":
case "_FORCE_OFF":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? LOCK_CANCEL : LOCK;
@@ -256,7 +256,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_FORCE_ON":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? FORCE_ON_CANCEL : FORCE_ON;
@@ -264,7 +264,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_INHIBIT":
- command = Values.getIntegerCoerced(value)
+ command = ValueUtil.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
return duration == 0 ? INHIBIT_CANCEL : INHIBIT;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ThermostatProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ThermostatProcessor.java
index 22aa7c5a2..9ccee1e5d 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ThermostatProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/ThermostatProcessor.java
@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
import org.openremote.model.util.EnumUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.*;
@@ -159,7 +159,7 @@ public class ThermostatProcessor extends FeatureProcessor {
String modeStr = property.substring("TEMP_TARGET_".length());
return EnumUtil
.enumFromString(TemperatureMode.class, modeStr)
- .map(mode -> Values.getDoubleCoerced(value)
+ .map(mode -> ValueUtil.getDoubleCoerced(value)
.map(newTemp -> Math.round(newTemp*2d))
.map(newTemp -> {
int busValue = Math.toIntExact(newTemp);
@@ -179,7 +179,7 @@ public class ThermostatProcessor extends FeatureProcessor {
.map(mode -> getTempModePackets(device, mode, 0xFF00)) // Do this as a program step
.orElse(null);
} else if(property.startsWith("TEMP_MODE_") && property.endsWith("_MINS")) {
- return Values
+ return ValueUtil
.getIntegerCoerced(value)
.map(durationMinutes -> {
String modeStr = property.substring("TEMP_MODE_".length(), property.length() - "_MINS".length());
@@ -196,7 +196,7 @@ public class ThermostatProcessor extends FeatureProcessor {
.map(state -> getTempStatePackets(device, state, -1))
.orElse(null);
} else if ("TEMP_STATE_DISABLE_SECONDS".equals(property)) {
- return Values
+ return ValueUtil
.getIntegerCoerced(value)
.map(durationSeconds -> getTempStatePackets(device, TemperatureState.DISABLED, durationSeconds))
.orElse(null);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java
index 8be7c73dc..029d0a1fd 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java
@@ -38,8 +38,8 @@ import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TextUtil;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation;
@@ -121,7 +121,7 @@ public class WebsocketAgentProtocol extends AbstractIOClientProtocol<WebsocketAg
if (attribute.getType().equals(ValueType.EXECUTION_STATUS)) {
boolean isRequestStart = event.getValue()
- .flatMap(v -> Values.getValue(v, AttributeExecuteStatus.class))
+ .flatMap(v -> ValueUtil.getValue(v, AttributeExecuteStatus.class))
.map(status -> status == AttributeExecuteStatus.REQUEST_START)
.orElse(false);
if (!isRequestStart) {
@@ -130,7 +130,7 @@ public class WebsocketAgentProtocol extends AbstractIOClientProtocol<WebsocketAg
}
}
- return Values.convert(processedValue, String.class);
+ return ValueUtil.convert(processedValue, String.class);
}
@Override
@@ -315,7 +315,7 @@ public class WebsocketAgentProtocol extends AbstractIOClientProtocol<WebsocketAg
LOG.warning("WebsocketHttpSubscription returned an un-successful response code: " + response.getStatus());
}
} else {
- client.ioClient.sendMessage(Values.convert(subscription.body, String.class));
+ client.ioClient.sendMessage(ValueUtil.convert(subscription.body, String.class));
}
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
index 7a2794b55..469c09028 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
@@ -26,8 +26,8 @@ import org.openremote.model.attribute.Attribute;
import org.openremote.model.asset.AssetTreeNode;
import org.openremote.model.asset.agent.ConnectionStatus;
import org.openremote.model.attribute.MetaItem;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemType;
-import org.openremote.model.value.Values;
import org.openremote.model.value.impl.ColourRGB;
import org.openremote.protocol.zwave.ConnectionException;
import org.openremote.protocol.zwave.model.Controller;
@@ -167,16 +167,16 @@ public class ZWaveNetwork {
switch(type) {
case STRING:
- zwValue = Values.getString(value).map(StringValue::new).orElse(null);
+ zwValue = ValueUtil.getString(value).map(StringValue::new).orElse(null);
break;
case NUMBER:
- zwValue = Values.getDouble(value).map(NumberValue::new).orElse(null);
+ zwValue = ValueUtil.getDouble(value).map(NumberValue::new).orElse(null);
break;
case INTEGER:
- zwValue = Values.getInteger(value).map(NumberValue::new).orElse(null);
+ zwValue = ValueUtil.getInteger(value).map(NumberValue::new).orElse(null);
break;
case BOOLEAN:
- zwValue = Values.getBoolean(value).map(BooleanValue::new).orElse(null);
+ zwValue = ValueUtil.getBoolean(value).map(BooleanValue::new).orElse(null);
break;
case ARRAY:
if (value instanceof ColourRGB) {
@@ -188,7 +188,7 @@ public class ZWaveNetwork {
}
break;
/*
- zwValue = Values.getValue(value, Object[].class).map(arrValue -> {
+ zwValue = ValueUtil.getValue(value, Object[].class).map(arrValue -> {
ArrayValue zwArray = new ArrayValue();
@@ -202,13 +202,13 @@ public class ZWaveNetwork {
// Just assume the item's data type is the desired type - bit strange but no other data
ValueType valueType = null;
Class<?> itemType = arrValueItem.getClass();
- if (Values.isArray(itemType)) {
+ if (ValueUtil.isArray(itemType)) {
valueType = ValueType.ARRAY;
- } else if (Values.isNumber(itemType)) {
+ } else if (ValueUtil.isNumber(itemType)) {
valueType = ValueType.NUMBER;
- } else if (Values.isBoolean(itemType)) {
+ } else if (ValueUtil.isBoolean(itemType)) {
valueType = ValueType.BOOLEAN;
- } else if (Values.isString(itemType)) {
+ } else if (ValueUtil.isString(itemType)) {
valueType = ValueType.STRING;
}
if (valueType == null) {
diff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.java
index f8f8683da..e4adac2dc 100644
--- a/container/src/main/java/org/openremote/container/Container.java
+++ b/container/src/main/java/org/openremote/container/Container.java
@@ -25,7 +25,7 @@ import org.openremote.container.concurrent.ContainerThreads;
import org.openremote.container.util.LogUtil;
import org.openremote.model.ContainerService;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
@@ -116,7 +116,7 @@ public class Container implements org.openremote.model.Container {
this.devMode = getBoolean(this.config, DEV_MODE, DEV_MODE_DEFAULT);
if (this.devMode) {
- Values.JSON.enable(SerializationFeature.INDENT_OUTPUT);
+ ValueUtil.JSON.enable(SerializationFeature.INDENT_OUTPUT);
}
int scheduledTasksThreadsMax = getInteger(
diff --git a/container/src/main/java/org/openremote/container/json/JacksonConfig.java b/container/src/main/java/org/openremote/container/json/JacksonConfig.java
index 38a3f2df7..ed6662be3 100644
--- a/container/src/main/java/org/openremote/container/json/JacksonConfig.java
+++ b/container/src/main/java/org/openremote/container/json/JacksonConfig.java
@@ -20,8 +20,7 @@
package org.openremote.container.json;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openremote.model.Container;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -34,6 +33,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
@Override
public ObjectMapper getContext(Class<?> type) {
- return Values.JSON;
+ return ValueUtil.JSON;
}
}
diff --git a/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperJsonSerializer.java b/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperJsonSerializer.java
index b6e2e5d8a..0f9323acc 100644
--- a/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperJsonSerializer.java
+++ b/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperJsonSerializer.java
@@ -21,7 +21,7 @@ package org.openremote.container.persistence;
import com.vladmihalcea.hibernate.type.util.ObjectMapperWrapper;
import org.hibernate.internal.util.SerializationHelper;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.Serializable;
import java.util.Collection;
@@ -30,7 +30,7 @@ import java.util.Map;
public class CustomObjectMapperJsonSerializer extends com.vladmihalcea.hibernate.type.util.ObjectMapperJsonSerializer {
// super class field is private
- protected static ObjectMapperWrapper objectMapperWrapper = new ObjectMapperWrapper(Values.JSON);
+ protected static ObjectMapperWrapper objectMapperWrapper = new ObjectMapperWrapper(ValueUtil.JSON);
public CustomObjectMapperJsonSerializer() {
super(objectMapperWrapper);
@@ -44,7 +44,7 @@ public class CustomObjectMapperJsonSerializer extends com.vladmihalcea.hibernate
// Bug in default implementation means it cannot cope with subclasses of parameterized types that don't have type params
if (object instanceof Collection && object.getClass().getTypeParameters().length == 0) {
- Object firstElement = Values.findFirstNonNullElement((Collection<?>) object);
+ Object firstElement = ValueUtil.findFirstNonNullElement((Collection<?>) object);
if (firstElement != null && !(firstElement instanceof Serializable)) {
return objectMapperWrapper.fromBytes(objectMapperWrapper.toBytes(object), (Class<T>)object.getClass());
@@ -54,7 +54,7 @@ public class CustomObjectMapperJsonSerializer extends com.vladmihalcea.hibernate
}
if (object instanceof Map && object.getClass().getTypeParameters().length == 0) {
- Map.Entry<?,?> firstEntry = Values.findFirstNonNullEntry((Map<?,?>) object);
+ Map.Entry<?,?> firstEntry = ValueUtil.findFirstNonNullEntry((Map<?,?>) object);
if (firstEntry != null) {
Object key = firstEntry.getKey();
Object value = firstEntry.getValue();
diff --git a/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperSupplier.java b/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperSupplier.java
index 0f043a54e..279c2ea1c 100644
--- a/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperSupplier.java
+++ b/container/src/main/java/org/openremote/container/persistence/CustomObjectMapperSupplier.java
@@ -21,12 +21,12 @@ package org.openremote.container.persistence;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vladmihalcea.hibernate.type.util.ObjectMapperSupplier;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
public class CustomObjectMapperSupplier implements ObjectMapperSupplier {
@Override
public ObjectMapper get() {
- return Values.JSON;
+ return ValueUtil.JSON;
}
}
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java
index f9b7f9e06..d2386dda1 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java
@@ -24,7 +24,7 @@ import com.zaxxer.hikari.HikariPoolMXBean;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.management.JMX;
import javax.management.MBeanServer;
@@ -93,7 +93,7 @@ public class PersistenceHealthStatusProvider implements HealthStatusProvider, Co
int totalConnections = poolMBean.getTotalConnections();
int threadsWaiting = poolMBean.getThreadsAwaitingConnection();
- ObjectNode value = Values.JSON.createObjectNode();
+ ObjectNode value = ValueUtil.JSON.createObjectNode();
value.put("idleConnections", idleConnections);
value.put("activeConnections", activeConnections);
value.put("totalConnections", totalConnections);
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 452ed45ce..0e5e199d2 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -44,7 +44,7 @@ import org.openremote.model.rules.TenantRuleset;
import org.openremote.model.security.Tenant;
import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogEvent;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.persistence.*;
import javax.persistence.spi.ClassTransformer;
@@ -288,7 +288,7 @@ public class PersistenceService implements ContainerService {
entityClasses.add("org.openremote.container.util");
// Get asset sub type entities from asset model
- Arrays.stream(Values.getAssetDescriptors(null))
+ Arrays.stream(ValueUtil.getAssetDescriptors(null))
.map(AssetDescriptor::getType)
.filter(assetClass -> assetClass.getAnnotation(Entity.class) != null)
.map(Class::getName)
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java
index 52a549fdc..2363dc6c3 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java
@@ -25,7 +25,7 @@ import org.openremote.model.ContainerService;
import org.openremote.model.asset.agent.Agent;
import org.openremote.model.asset.agent.ConnectionStatus;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.concurrent.atomic.AtomicInteger;
@@ -72,7 +72,7 @@ public class AgentHealthStatusProvider implements HealthStatusProvider, Containe
AtomicInteger errorCount = new AtomicInteger(0);
AtomicInteger otherCount = new AtomicInteger(0);
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
objectValue.put("agents", agentService.getAgents().size());
objectValue.put("protocols", agentService.protocolInstanceMap.size());
@@ -102,7 +102,7 @@ public class AgentHealthStatusProvider implements HealthStatusProvider, Containe
otherCount.incrementAndGet();
}
- ObjectNode agentValue = Values.JSON.createObjectNode();
+ ObjectNode agentValue = ValueUtil.JSON.createObjectNode();
agentValue.put("name", agent.getName());
agentValue.put("status", status != null ? status.name() : "null");
agentValue.put("type", agent.getType());
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
index bfbe20a4a..f267a0ea8 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
@@ -32,7 +32,7 @@ import org.openremote.model.asset.agent.AgentResource;
import org.openremote.model.file.FileInfo;
import org.openremote.model.http.RequestParams;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.*;
import java.nio.charset.StandardCharsets;
@@ -85,7 +85,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
}
}
- Optional<AgentDescriptor<?, ?, ?>> agentDescriptor = Values.getAgentDescriptor(agentType);
+ Optional<AgentDescriptor<?, ?, ?>> agentDescriptor = ValueUtil.getAgentDescriptor(agentType);
if (!agentDescriptor.isPresent()) {
throw new IllegalArgumentException("Agent descriptor not found: agent type =" + agentType);
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
index 35d6dac51..34e23f501 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
@@ -31,9 +31,9 @@ import org.openremote.model.ContainerService;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.AssetTypeInfo;
import org.openremote.model.util.TextUtil;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemDescriptor;
import org.openremote.model.value.ValueDescriptor;
-import org.openremote.model.value.Values;
// TODO: Implement model client event support
/**
@@ -101,7 +101,7 @@ public class AssetModelService extends RouteBuilder implements ContainerService
return new AssetTypeInfo[0];
}
- return Values.getAssetInfos(parentType);
+ return ValueUtil.getAssetInfos(parentType);
}
public AssetTypeInfo getAssetInfo(String parentId, String assetType) {
@@ -111,7 +111,7 @@ public class AssetModelService extends RouteBuilder implements ContainerService
return null;
}
- return Values.getAssetInfo(assetType).orElse(null);
+ return ValueUtil.getAssetInfo(assetType).orElse(null);
}
public AssetDescriptor<?>[] getAssetDescriptors(String parentId, String parentType) {
@@ -121,7 +121,7 @@ public class AssetModelService extends RouteBuilder implements ContainerService
return new AssetDescriptor[0];
}
- return Values.getAssetDescriptors(parentType);
+ return ValueUtil.getAssetDescriptors(parentType);
}
public ValueDescriptor<?>[] getValueDescriptors(String parentId) {
@@ -131,7 +131,7 @@ public class AssetModelService extends RouteBuilder implements ContainerService
return new ValueDescriptor<?>[0];
}
- return Values.getValueDescriptors();
+ return ValueUtil.getValueDescriptors();
}
public MetaItemDescriptor<?>[] getMetaItemDescriptors(String parentId) {
@@ -141,6 +141,6 @@ public class AssetModelService extends RouteBuilder implements ContainerService
return new MetaItemDescriptor<?>[0];
}
- return Values.getMetaItemDescriptors();
+ return ValueUtil.getMetaItemDescriptors();
}
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index 47330f0aa..6d7095c83 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -42,9 +42,9 @@ import org.openremote.model.asset.agent.Protocol;
import org.openremote.model.attribute.*;
import org.openremote.model.attribute.AttributeEvent.Source;
import org.openremote.model.security.ClientRole;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemType;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import javax.persistence.EntityManager;
import java.util.ArrayList;
@@ -352,7 +352,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
// For executable attributes, non-sensor sources can set a writable attribute execute status
if (oldAttribute.getType() == ValueType.EXECUTION_STATUS && source != SENSOR) {
Optional<AttributeExecuteStatus> status = event.getValue()
- .flatMap(Values::getString)
+ .flatMap(ValueUtil::getString)
.flatMap(AttributeExecuteStatus::fromString);
if (status.isPresent() && !status.get().isWrite()) {
@@ -363,7 +363,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
// Type coercion
Object value = event.getValue().map(eventValue -> {
Class<?> attributeValueType = oldAttribute.getType().getType();
- return Values.getValueCoerced(eventValue, attributeValueType).orElseThrow(() -> {
+ return ValueUtil.getValueCoerced(eventValue, attributeValueType).orElseThrow(() -> {
LOG.info("Failed to coerce attribute event value into the correct value type: event value type=" + eventValue.getClass() + ", attribute value type=" + attributeValueType);
return new AssetProcessingException(INVALID_VALUE_FOR_WELL_KNOWN_ATTRIBUTE);
});
@@ -413,7 +413,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
// Create a copy of the attribute and set the new value and timestamp
@SuppressWarnings("rawtypes")
- Attribute updatedAttribute = Values.clone(oldAttribute);
+ Attribute updatedAttribute = ValueUtil.clone(oldAttribute);
updatedAttribute.setValue(value, eventTime);
// Push through all processors
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index 1dc40d004..07d6e6af6 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -33,7 +33,7 @@ import org.openremote.model.http.RequestParams;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.persistence.OptimisticLockException;
import javax.validation.ConstraintViolationException;
@@ -292,7 +292,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
return false;
});
- MetaMap existingMetaItems = Values.clone(existingAttribute.getMeta());
+ MetaMap existingMetaItems = ValueUtil.clone(existingAttribute.getMeta());
existingMetaItems.addOrReplace(updatedMetaItems);
@@ -421,7 +421,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
throw new WebApplicationException(FORBIDDEN);
}
- Asset<?> newAsset = Values.clone(asset);
+ Asset<?> newAsset = ValueUtil.clone(asset);
// Allow client to set identifier
if (asset.getId() != null) {
@@ -582,7 +582,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
@Override
public Asset<?>[] getPublicAssets(RequestParams requestParams, String q) {
- AssetQuery assetQuery = TextUtil.isNullOrEmpty(q) ? null : Values.parse(q, AssetQuery.class)
+ AssetQuery assetQuery = TextUtil.isNullOrEmpty(q) ? null : ValueUtil.parse(q, AssetQuery.class)
.orElseThrow(() -> new WebApplicationException("Error parsing query parameter 'q' as JSON object", BAD_REQUEST));
Asset<?>[] result = queryPublicAssets(requestParams, assetQuery);
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 81b363e4c..510745034 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -55,7 +55,7 @@ import org.openremote.model.security.ClientRole;
import org.openremote.model.security.User;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import org.postgresql.util.PGobject;
import javax.persistence.EntityManager;
@@ -590,7 +590,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
T existingAsset = TextUtil.isNullOrEmpty(asset.getId()) ? null : (T)em.find(Asset.class, asset.getId());
// Do standard JSR-380 validation on the asset (includes custom validation)
- Set<ConstraintViolation<Asset<?>>> validationFailures = Values.validate(asset, Asset.AssetSave.class);
+ Set<ConstraintViolation<Asset<?>>> validationFailures = ValueUtil.validate(asset, Asset.AssetSave.class);
if (validationFailures.size() > 0) {
String msg = "Asset merge failed as asset has failed constraint validation: asset=" + asset;
@@ -1133,7 +1133,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
PGobject pgJsonValue = new PGobject();
pgJsonValue.setType("jsonb");
// Careful, do not set Java null here! It will erase your whole SQL column!
- pgJsonValue.setValue(Values.asJSON(value).orElse(Values.NULL_LITERAL));
+ pgJsonValue.setValue(ValueUtil.asJSON(value).orElse(ValueUtil.NULL_LITERAL));
statement.setObject(2, pgJsonValue);
// Bind the value timestamp
@@ -1156,7 +1156,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
LOG.finest("Stored asset '" + asset.getId()
+ "' attribute '" + attributeName
+ "' (affected rows: " + updatedRows + ") value: "
- + (value != null ? Values.asJSON(value).orElse("null") : "null"));
+ + (value != null ? ValueUtil.asJSON(value).orElse("null") : "null"));
}
return updatedRows == 1;
}
@@ -1590,7 +1590,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
protected static String[] getResolvedAssetTypes(Class<? extends Asset<?>>[] assetClasses) {
return Arrays.stream(assetClasses)
.flatMap(assetClass ->
- Arrays.stream(Values.getAssetClasses(null)).filter(assetClass::isAssignableFrom))
+ Arrays.stream(ValueUtil.getAssetClasses(null)).filter(assetClass::isAssignableFrom))
.map(Class::getSimpleName)
.distinct()
.toArray(String[]::new);
@@ -1826,7 +1826,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
final int pos = binders.size() + 1;
attributeBuilder.append(" @> ?").append(pos).append(" \\:\\:jsonb");
- binders.add((em, st) -> st.setParameter(pos, Values.asJSON(arrayPredicate.value).orElse(Values.NULL_LITERAL)));
+ binders.add((em, st) -> st.setParameter(pos, ValueUtil.asJSON(arrayPredicate.value).orElse(ValueUtil.NULL_LITERAL)));
} else {
attributeBuilder.append("true");
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java b/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java
index fd9042258..c751f7ae5 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java
@@ -29,8 +29,8 @@ import org.openremote.model.attribute.AttributeEvent.Source;
import org.openremote.model.protocol.ProtocolUtil;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemType;
-import org.openremote.model.value.Values;
import javax.persistence.EntityManager;
import java.util.Arrays;
@@ -163,7 +163,7 @@ public class AttributeLinkingService implements ContainerService, AssetUpdatePro
// Do basic value conversion
if (!attribute.getType().getType().isAssignableFrom(value[0].getClass())) {
- Object val = Values.convert(value[0], attribute.getType().getType());
+ Object val = ValueUtil.convert(value[0], attribute.getType().getType());
if (val == null) {
LOG.warning("Failed to convert value: " + value[0].getClass() + " -> " + attribute.getType().getType());
@@ -186,7 +186,7 @@ public class AttributeLinkingService implements ContainerService, AssetUpdatePro
// Filter the value first
if (attributeLink.getFilters() != null) {
- originalValue = Values.applyValueFilters(originalValue, attributeLink.getFilters());
+ originalValue = ValueUtil.applyValueFilters(originalValue, attributeLink.getFilters());
}
Object finalOriginalValue = originalValue;
@@ -214,8 +214,8 @@ public class AttributeLinkingService implements ContainerService, AssetUpdatePro
}
protected static Optional<AttributeLink.ConverterType> getSpecialConverter(Object value) {
- if (value != null && Values.isString(value.getClass())) {
- return AttributeLink.ConverterType.fromValue(Values.getValue(value, String.class).orElse(""));
+ if (value != null && ValueUtil.isString(value.getClass())) {
+ return AttributeLink.ConverterType.fromValue(ValueUtil.getValue(value, String.class).orElse(""));
}
return Optional.empty();
}
@@ -234,7 +234,7 @@ public class AttributeLinkingService implements ContainerService, AssetUpdatePro
"cannot toggle value as attribute cannot be found: " + linkedAttributeRef
)
);
- if (!Values.isBoolean(currentAttribute.getType().getType())) {
+ if (!ValueUtil.isBoolean(currentAttribute.getType().getType())) {
throw new AssetProcessingException(
AttributeWriteFailure.LINKED_ATTRIBUTE_CONVERSION_FAILURE,
"cannot toggle value as attribute is not of type BOOLEAN: " + linkedAttributeRef
@@ -255,14 +255,14 @@ public class AttributeLinkingService implements ContainerService, AssetUpdatePro
"cannot toggle value as attribute cannot be found: " + linkedAttributeRef
)
);
- if (!Values.isNumber(currentAttribute.getType().getType())) {
+ if (!ValueUtil.isNumber(currentAttribute.getType().getType())) {
throw new AssetProcessingException(
AttributeWriteFailure.LINKED_ATTRIBUTE_CONVERSION_FAILURE,
"cannot increment/decrement value as attribute is not of type NUMBER: " + linkedAttributeRef
);
}
int change = converter == AttributeLink.ConverterType.INCREMENT ? +1 : -1;
- return new Pair<>(false, (Values.getValueCoerced(currentAttribute.getValue().orElse(null), Double.class).orElse(0D) + change));
+ return new Pair<>(false, (ValueUtil.getValueCoerced(currentAttribute.getValue().orElse(null), Double.class).orElse(0D) + change));
} catch (NoSuchElementException e) {
LOG.fine("The attribute doesn't exist so ignoring increment/decrement value request: " + linkedAttributeRef);
return new Pair<>(true, null);
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
index 8baf7fc26..edddb90fb 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
@@ -5,7 +5,6 @@ import org.hibernate.Session;
import org.hibernate.jdbc.AbstractReturningWork;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.timer.TimerService;
-import org.openremote.container.util.UniqueIdentifierGenerator;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
@@ -17,30 +16,24 @@ import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.DatapointPeriod;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.util.Pair;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import org.postgresql.util.PGInterval;
import org.postgresql.util.PGobject;
import javax.persistence.TypedQuery;
-import java.io.File;
-import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Instant;
import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
import static java.time.temporal.ChronoUnit.DAYS;
@@ -324,12 +317,12 @@ public abstract class AbstractDatapointService<T extends Datapoint> implements C
Object value = null;
if (rs.getObject(2) != null) {
if (downsample) {
- value = Values.getValueCoerced(rs.getObject(2), Double.class).orElse(null);
+ value = ValueUtil.getValueCoerced(rs.getObject(2), Double.class).orElse(null);
} else {
if (rs.getObject(2) instanceof PGobject) {
- value = Values.parse(((PGobject) rs.getObject(2)).getValue()).orElse(null);
+ value = ValueUtil.parse(((PGobject) rs.getObject(2)).getValue()).orElse(null);
} else {
- value = Values.getValueCoerced(rs.getObject(2), JsonNode.class).orElse(null);
+ value = ValueUtil.getValueCoerced(rs.getObject(2), JsonNode.class).orElse(null);
}
}
}
@@ -382,7 +375,7 @@ public abstract class AbstractDatapointService<T extends Datapoint> implements C
protected void setUpsertValues(PreparedStatement st, String assetId, String attributeName, Object value, LocalDateTime timestamp) throws Exception {
PGobject pgJsonValue = new PGobject();
pgJsonValue.setType("jsonb");
- pgJsonValue.setValue(Values.asJSON(value).orElse("null"));
+ pgJsonValue.setValue(ValueUtil.asJSON(value).orElse("null"));
st.setString(1, assetId);
st.setString(2, attributeName);
st.setObject(3, pgJsonValue);
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java
index ab4875ba2..66f2692d5 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
public class AssetDatapointHealthStatusProvider implements HealthStatusProvider, ContainerService {
@@ -63,7 +63,7 @@ public class AssetDatapointHealthStatusProvider implements HealthStatusProvider,
@Override
public Object getHealthStatus() {
- ObjectNode value = Values.JSON.createObjectNode();
+ ObjectNode value = ValueUtil.JSON.createObjectNode();
value.put("totalDatapoints", assetDatapointService.getDatapointsCount());
return value;
}
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index 7d882e2bc..d637bafe4 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -42,12 +42,8 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.container.ConnectionCallback;
import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -58,7 +54,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import static org.openremote.model.syslog.SyslogCategory.DATA;
-import static org.openremote.model.value.Values.JSON;
+import static org.openremote.model.util.ValueUtil.JSON;
public class AssetDatapointResourceImpl extends ManagerWebResource implements AssetDatapointResource {
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java
index 6def5ac4a..41f537432 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
public class AssetPredictedDatapointHealthStatusProvider implements HealthStatusProvider, ContainerService {
public static final String NAME = "predicted";
@@ -62,7 +62,7 @@ public class AssetPredictedDatapointHealthStatusProvider implements HealthStatus
@Override
public Object getHealthStatus() {
- ObjectNode value = Values.JSON.createObjectNode();
+ ObjectNode value = ValueUtil.JSON.createObjectNode();
value.put("totalDatapoints", assetPredictedDatapointService.getDatapointsCount());
return value;
}
diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
index 21ce21e09..43d64957d 100644
--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
@@ -46,7 +46,7 @@ import org.openremote.model.query.filter.BooleanPredicate;
import org.openremote.model.query.filter.StringPredicate;
import org.openremote.model.util.Pair;
import org.openremote.model.value.MetaItemType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.time.*;
import java.time.format.DateTimeFormatter;
@@ -589,7 +589,7 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
return false;
}
- Class<?> assetClass = Values
+ Class<?> assetClass = ValueUtil
.getAssetDescriptor(((GroupAsset)asset).getChildAssetType().orElse(null))
.map(AssetDescriptor::getType)
.orElse(null);
diff --git a/manager/src/main/java/org/openremote/manager/event/EventTypeConverters.java b/manager/src/main/java/org/openremote/manager/event/EventTypeConverters.java
index 534e781b9..9955f9372 100644
--- a/manager/src/main/java/org/openremote/manager/event/EventTypeConverters.java
+++ b/manager/src/main/java/org/openremote/manager/event/EventTypeConverters.java
@@ -42,10 +42,9 @@ package org.openremote.manager.event;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConverters;
-import org.openremote.model.Container;
import org.openremote.model.event.TriggeredEventSubscription;
import org.openremote.model.event.shared.*;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.logging.Logger;
@@ -58,17 +57,17 @@ public class EventTypeConverters implements TypeConverters {
@Converter
public String writeEvent(SharedEvent event, Exchange exchange) throws Exception {
- return SharedEvent.MESSAGE_PREFIX + Values.JSON.writeValueAsString(event);
+ return SharedEvent.MESSAGE_PREFIX + ValueUtil.JSON.writeValueAsString(event);
}
@Converter
public String writeEventArray(SharedEvent[] event, Exchange exchange) throws Exception {
- return SharedEvent.MESSAGE_PREFIX + Values.JSON.writeValueAsString(event);
+ return SharedEvent.MESSAGE_PREFIX + ValueUtil.JSON.writeValueAsString(event);
}
@Converter
public String writeTriggeredEventSubscription(TriggeredEventSubscription triggeredEventSubscription, Exchange exchange) throws Exception {
- return TriggeredEventSubscription.MESSAGE_PREFIX + Values.JSON.writeValueAsString(triggeredEventSubscription);
+ return TriggeredEventSubscription.MESSAGE_PREFIX + ValueUtil.JSON.writeValueAsString(triggeredEventSubscription);
}
@Converter
@@ -76,12 +75,12 @@ public class EventTypeConverters implements TypeConverters {
if (!string.startsWith(SharedEvent.MESSAGE_PREFIX))
return null;
string = string.substring(SharedEvent.MESSAGE_PREFIX.length());
- return Values.JSON.readValue(string, SharedEvent.class);
+ return ValueUtil.JSON.readValue(string, SharedEvent.class);
}
@Converter
public String writeEventSubscription(EventSubscription eventSubscription, Exchange exchange) throws Exception {
- return (eventSubscription.isSubscribed() ? SUBSCRIBED_MESSAGE_PREFIX : SUBSCRIBE_MESSAGE_PREFIX) + Values.JSON.writeValueAsString(eventSubscription);
+ return (eventSubscription.isSubscribed() ? SUBSCRIBED_MESSAGE_PREFIX : SUBSCRIBE_MESSAGE_PREFIX) + ValueUtil.JSON.writeValueAsString(eventSubscription);
}
@Converter
@@ -89,7 +88,7 @@ public class EventTypeConverters implements TypeConverters {
if (!string.startsWith(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX))
return null;
string = string.substring(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX.length());
- return Values.JSON.readValue(string, EventSubscription.class);
+ return ValueUtil.JSON.readValue(string, EventSubscription.class);
}
@Converter
@@ -97,12 +96,12 @@ public class EventTypeConverters implements TypeConverters {
if (!string.startsWith(CancelEventSubscription.MESSAGE_PREFIX))
return null;
string = string.substring(CancelEventSubscription.MESSAGE_PREFIX.length());
- return Values.JSON.readValue(string, CancelEventSubscription.class);
+ return ValueUtil.JSON.readValue(string, CancelEventSubscription.class);
}
@Converter
public String writeUnauthorizedEventSubscription(UnauthorizedEventSubscription unauthorizedEventSubscription, Exchange exchange) throws Exception {
- return UnauthorizedEventSubscription.MESSAGE_PREFIX + Values.JSON.writeValueAsString(unauthorizedEventSubscription);
+ return UnauthorizedEventSubscription.MESSAGE_PREFIX + ValueUtil.JSON.writeValueAsString(unauthorizedEventSubscription);
}
@Converter
@@ -110,11 +109,11 @@ public class EventTypeConverters implements TypeConverters {
if (!string.startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX))
return null;
string = string.substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length());
- return Values.JSON.readValue(string, EventRequestResponseWrapper.class);
+ return ValueUtil.JSON.readValue(string, EventRequestResponseWrapper.class);
}
@Converter
public String writeRequestResponse(EventRequestResponseWrapper requestResponseWrapper, Exchange exchange) throws Exception {
- return EventRequestResponseWrapper.MESSAGE_PREFIX + Values.JSON.writeValueAsString(requestResponseWrapper);
+ return EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.JSON.writeValueAsString(requestResponseWrapper);
}
}
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 e8b0baeb3..6289a540b 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -49,7 +49,7 @@ import org.openremote.model.gateway.GatewayDisconnectEvent;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
@@ -372,11 +372,11 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
protected <T> T messageFromString(String message, String prefix, Class<T> clazz) {
message = message.substring(prefix.length());
- return Values.parse(message, clazz).orElse(null);
+ return ValueUtil.parse(message, clazz).orElse(null);
}
protected String messageToString(String prefix, Object message) {
- String str = Values.asJSON(message).orElse("null");
+ String str = ValueUtil.asJSON(message).orElse("null");
return prefix + str;
}
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.java
index 2f470add3..19a1486ca 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapService.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java
@@ -31,7 +31,7 @@ import org.openremote.manager.web.ManagerWebService;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.core.UriBuilder;
import java.nio.file.Files;
@@ -43,7 +43,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -102,9 +101,9 @@ public class MapService implements ContainerService {
int maxZoom = Integer.parseInt(resultMap.get("maxzoom"));
int minZoom = Integer.parseInt(resultMap.get("minzoom"));
- ArrayNode vectorLayer = resultMap.containsKey("json") ? (ArrayNode)Values.JSON.readTree(resultMap.get("json")).get("vector_layers") : null;
- ArrayNode center = resultMap.containsKey("center") ? (ArrayNode)Values.JSON.readTree("[" + resultMap.get("center") + "]") : null;
- ArrayNode bounds = resultMap.containsKey("bounds") ? (ArrayNode)Values.JSON.readTree("[" + resultMap.get("bounds") + "]") : null;
+ ArrayNode vectorLayer = resultMap.containsKey("json") ? (ArrayNode) ValueUtil.JSON.readTree(resultMap.get("json")).get("vector_layers") : null;
+ ArrayNode center = resultMap.containsKey("center") ? (ArrayNode) ValueUtil.JSON.readTree("[" + resultMap.get("center") + "]") : null;
+ ArrayNode bounds = resultMap.containsKey("bounds") ? (ArrayNode) ValueUtil.JSON.readTree("[" + resultMap.get("bounds") + "]") : null;
if (!TextUtil.isNullOrEmpty(attribution) && vectorLayer != null && !vectorLayer.isEmpty() && maxZoom > 0) {
metadata = new Metadata(attribution, vectorLayer, bounds, center, maxZoom, minZoom);
@@ -123,7 +122,7 @@ public class MapService implements ContainerService {
ObjectNode mapSettings = null;
try {
- mapSettings = (ObjectNode)Values.JSON.readTree(Files.readAllBytes(mapSettingsPath));
+ mapSettings = (ObjectNode) ValueUtil.JSON.readTree(Files.readAllBytes(mapSettingsPath));
} catch (Exception ex) {
LOG.log(Level.SEVERE, "Failed to extract map config from: " + mapSettingsPath.toAbsolutePath(), ex);
}
@@ -365,13 +364,13 @@ public class MapService implements ContainerService {
return mapSettingsJs.get(realm);
}
- final ObjectNode settings = mapSettingsJs.computeIfAbsent(realm, r -> Values.JSON.createObjectNode());
+ final ObjectNode settings = mapSettingsJs.computeIfAbsent(realm, r -> ValueUtil.JSON.createObjectNode());
if (!metadata.isValid() || mapConfig.isEmpty()) {
return settings;
}
- ArrayNode tilesArray = Values.JSON.createArrayNode();
+ ArrayNode tilesArray = ValueUtil.JSON.createArrayNode();
String tileUrl = baseUriBuilder.clone().replacePath(RASTER_MAP_TILE_PATH).build().toString() + "/{z}/{x}/{y}.png";
tilesArray.insert(0, tileUrl);
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 11eee0c6d..32b86d90d 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -44,7 +44,7 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.TriggeredEventSubscription;
import org.openremote.model.event.shared.SharedEvent;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.nio.charset.Charset;
import java.util.*;
@@ -167,7 +167,7 @@ public class MqttBrokerService implements ContainerService {
public void sendToSession(String sessionId, String topic, Object data) {
try {
- ByteBuf payload = Unpooled.copiedBuffer(Values.asJSON(data).orElseThrow(() -> new IllegalStateException("Failed to convert payload to JSON string: " + data)), Charset.defaultCharset());
+ ByteBuf payload = Unpooled.copiedBuffer(ValueUtil.asJSON(data).orElseThrow(() -> new IllegalStateException("Failed to convert payload to JSON string: " + data)), Charset.defaultCharset());
MqttPublishMessage publishMessage = MqttMessageBuilders.publish()
.qos(MqttQoS.AT_MOST_ONCE)
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
index 5c0e51bc1..286eb7368 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
@@ -40,7 +40,7 @@ import org.openremote.model.event.shared.CancelEventSubscription;
import org.openremote.model.event.shared.EventSubscription;
import org.openremote.model.event.shared.SharedEvent;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -248,10 +248,10 @@ public class ORInterceptHandler extends AbstractInterceptHandler {
if (isValueWrite) {
String assetId = topicTokens.get(1);
String attributeName = topicTokens.get(2);
- Object value = Values.parse(payloadContent).orElse(null);
+ Object value = ValueUtil.parse(payloadContent).orElse(null);
attributeEvent = new AttributeEvent(assetId, attributeName, value);
} else {
- attributeEvent = Values.parse(payloadContent, AttributeEvent.class).orElse(null);
+ attributeEvent = ValueUtil.parse(payloadContent, AttributeEvent.class).orElse(null);
}
if (attributeEvent == null) {
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
index 1cf3d249e..333502641 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
@@ -31,7 +31,7 @@ import org.openremote.model.notification.Notification;
import org.openremote.model.notification.NotificationResource;
import org.openremote.model.notification.SentNotification;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.WebApplicationException;
import java.util.Collections;
@@ -152,7 +152,7 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
SentNotification sentNotification = notificationService.getSentNotification(notificationId);
verifyAccess(sentNotification, targetId);
- notificationService.setNotificationAcknowleged(notificationId, acknowledgement == null ? null : Values.asJSON(acknowledgement).orElse(null));
+ notificationService.setNotificationAcknowleged(notificationId, acknowledgement == null ? null : ValueUtil.asJSON(acknowledgement).orElse(null));
}
protected void verifyAccess(SentNotification sentNotification, String targetId) {
diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
index d8f4fe5c5..cc6bc66f9 100644
--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
@@ -41,7 +41,7 @@ import org.openremote.model.notification.PushNotificationMessage;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.*;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.InputStream;
import java.nio.file.Files;
@@ -392,7 +392,7 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
}
if (pushMessage.getData() != null) {
- builder.putAllData(Values.JSON.convertValue(pushMessage.getData(), new TypeReference<Map<String, String>>(){}));
+ builder.putAllData(ValueUtil.JSON.convertValue(pushMessage.getData(), new TypeReference<Map<String, String>>(){}));
if (dataOnly) {
apsBuilder.setContentAvailable(true);
@@ -404,11 +404,11 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
try {
if (pushMessage.getAction() != null) {
- builder.putData("action", Values.asJSONOrThrow(pushMessage.getAction()));
+ builder.putData("action", ValueUtil.asJSONOrThrow(pushMessage.getAction()));
}
if (pushMessage.getButtons() != null) {
- builder.putData("buttons", Values.asJSONOrThrow(pushMessage.getButtons()));
+ builder.putData("buttons", ValueUtil.asJSONOrThrow(pushMessage.getButtons()));
}
} catch (JsonProcessingException e) {
e.printStackTrace();
diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
index 38932da90..50b1f6ecb 100644
--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
@@ -28,9 +28,9 @@ import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.LogicGroup;
import org.openremote.model.query.filter.*;
import org.openremote.model.rules.AssetState;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaHolder;
import org.openremote.model.value.NameValueHolder;
-import org.openremote.model.value.Values;
import java.util.ArrayList;
import java.util.Arrays;
@@ -85,7 +85,7 @@ public class AssetQueryPredicate implements Predicate<AssetState<?>> {
if (query.types != null && query.types.length > 0) {
if (Arrays.stream(query.types).noneMatch(type ->
type.isAssignableFrom(
- Values.getAssetDescriptor(assetState.getAssetType())
+ ValueUtil.getAssetDescriptor(assetState.getAssetType())
.orElse(ThingAsset.DESCRIPTOR).getType()))
) {
return false;
@@ -159,11 +159,11 @@ public class AssetQueryPredicate implements Predicate<AssetState<?>> {
}
Object rawValue = nameValueHolder.getValue().get();
- if (!Values.isArray(rawValue.getClass()) && !Values.isObject(rawValue.getClass())) {
+ if (!ValueUtil.isArray(rawValue.getClass()) && !ValueUtil.isObject(rawValue.getClass())) {
return null;
}
- JsonNode jsonNode = Values.convert(nameValueHolder.getValue(), JsonNode.class);
+ JsonNode jsonNode = ValueUtil.convert(nameValueHolder.getValue(), JsonNode.class);
for (Object path : predicate.path.getPaths()) {
if (path == null) {
return null;
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 5f304dffd..be0365d7a 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -38,8 +38,8 @@ import org.openremote.model.rules.*;
import org.openremote.model.rules.json.*;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.TimeUtil;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemType;
-import org.openremote.model.value.Values;
import org.quartz.CronExpression;
import java.util.*;
@@ -54,7 +54,7 @@ import java.util.stream.Stream;
import static org.openremote.manager.rules.AssetQueryPredicate.groupIsEmpty;
import static org.openremote.model.query.filter.LocationAttributePredicate.getLocationPredicates;
-import static org.openremote.model.value.Values.distinctByKey;
+import static org.openremote.model.util.ValueUtil.distinctByKey;
public class JsonRulesBuilder extends RulesBuilder {
@@ -519,7 +519,7 @@ public class JsonRulesBuilder extends RulesBuilder {
rulesStr = rulesStr.replace(PLACEHOLDER_RULESET_ID, Long.toString(ruleset.getId()));
rulesStr = rulesStr.replace(PLACEHOLDER_RULESET_NAME, ruleset.getName());
- JsonRulesetDefinition jsonRulesetDefinition = Values.parse(rulesStr, JsonRulesetDefinition.class).orElse(null);
+ JsonRulesetDefinition jsonRulesetDefinition = ValueUtil.parse(rulesStr, JsonRulesetDefinition.class).orElse(null);
if (jsonRulesetDefinition == null || jsonRulesetDefinition.rules == null || jsonRulesetDefinition.rules.length == 0) {
throw new IllegalArgumentException("No rules within ruleset so nothing to start: " + ruleset);
@@ -752,7 +752,7 @@ public class JsonRulesBuilder extends RulesBuilder {
if (!TextUtil.isNullOrEmpty(body)) {
if (body.contains(PLACEHOLDER_TRIGGER_ASSETS)) {
// Need to clone the notification
- notification = Values.clone(notification);
+ notification = ValueUtil.clone(notification);
String triggeredAssetInfo = buildTriggeredAssetInfo(useUnmatched, ruleState, isHtml);
body = body.replace(PLACEHOLDER_TRIGGER_ASSETS, triggeredAssetInfo);
@@ -894,42 +894,42 @@ public class JsonRulesBuilder extends RulesBuilder {
matchingAssetStates.forEach(assetState -> {
Object value = assetState.getValue().orElse(null);
Class<?> valueType = assetState.getType().getType();
- boolean isArray = Values.isArray(valueType);
+ boolean isArray = ValueUtil.isArray(valueType);
- if (!isArray && !Values.isObject(valueType)) {
+ if (!isArray && !ValueUtil.isObject(valueType)) {
log(Level.WARNING, "Rule action target asset cannot determine value type or incompatible value type for attribute: " + assetState);
} else {
// Convert value to JSON Node to easily manipulate it
- value = isArray ? Values.convert(value, ArrayNode.class) : Values.convert(value, ObjectNode.class);
+ value = isArray ? ValueUtil.convert(value, ArrayNode.class) : ValueUtil.convert(value, ObjectNode.class);
switch (attributeUpdateAction.updateAction) {
case ADD:
if (isArray) {
- value = value == null ? Values.JSON.createArrayNode() : value;
- ((ArrayNode)value).add(Values.convert(attributeUpdateAction.value, JsonNode.class));
+ value = value == null ? ValueUtil.JSON.createArrayNode() : value;
+ ((ArrayNode)value).add(ValueUtil.convert(attributeUpdateAction.value, JsonNode.class));
} else {
- value = value == null ? Values.JSON.createObjectNode() : value;
- ((ObjectNode) value).set(attributeUpdateAction.key, Values.convert(attributeUpdateAction.value, JsonNode.class));
+ value = value == null ? ValueUtil.JSON.createObjectNode() : value;
+ ((ObjectNode) value).set(attributeUpdateAction.key, ValueUtil.convert(attributeUpdateAction.value, JsonNode.class));
}
break;
case ADD_OR_REPLACE:
case REPLACE:
if (isArray) {
- value = value == null ? Values.JSON.createArrayNode() : value;
+ value = value == null ? ValueUtil.JSON.createArrayNode() : value;
ArrayNode arrayValue = (ArrayNode) value;
if (attributeUpdateAction.index != null && arrayValue.size() >= attributeUpdateAction.index) {
- arrayValue.set(attributeUpdateAction.index, Values.convert(attributeUpdateAction.value, JsonNode.class));
+ arrayValue.set(attributeUpdateAction.index, ValueUtil.convert(attributeUpdateAction.value, JsonNode.class));
} else {
- arrayValue.add(Values.convert(attributeUpdateAction.value, JsonNode.class));
+ arrayValue.add(ValueUtil.convert(attributeUpdateAction.value, JsonNode.class));
}
} else {
- value = value == null ? Values.JSON.createObjectNode() : value;
+ value = value == null ? ValueUtil.JSON.createObjectNode() : value;
if (!TextUtil.isNullOrEmpty(attributeUpdateAction.key)) {
- ((ObjectNode) value).set(attributeUpdateAction.key, Values.convert(attributeUpdateAction.value, JsonNode.class));
+ ((ObjectNode) value).set(attributeUpdateAction.key, ValueUtil.convert(attributeUpdateAction.value, JsonNode.class));
} else {
- log(Level.WARNING, "JSON Rule: Rule action missing required 'key': " + Values.asJSON(attributeUpdateAction));
+ log(Level.WARNING, "JSON Rule: Rule action missing required 'key': " + ValueUtil.asJSON(attributeUpdateAction));
}
}
break;
@@ -944,9 +944,9 @@ public class JsonRulesBuilder extends RulesBuilder {
break;
case CLEAR:
if (isArray) {
- value = Values.JSON.createArrayNode();
+ value = ValueUtil.JSON.createArrayNode();
} else {
- value = Values.JSON.createObjectNode();
+ value = ValueUtil.JSON.createObjectNode();
}
break;
}
@@ -994,7 +994,7 @@ public class JsonRulesBuilder extends RulesBuilder {
sb.append("</td><td>");
sb.append(assetState.getName());
sb.append("</td><td>");
- sb.append(assetState.getValue().flatMap(Values::asJSON).orElse(""));
+ sb.append(assetState.getValue().flatMap(ValueUtil::asJSON).orElse(""));
sb.append("</td></tr>");
}));
sb.append("</table>");
@@ -1007,7 +1007,7 @@ public class JsonRulesBuilder extends RulesBuilder {
sb.append("\t\t");
sb.append(assetState.getName());
sb.append("\t\t");
- sb.append(assetState.getValue().map(v -> Values.convert(v, String.class)).orElse(""));
+ sb.append(assetState.getValue().map(v -> ValueUtil.convert(v, String.class)).orElse(""));
}));
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
index fbae88fe6..11bd887b4 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
@@ -25,7 +25,7 @@ import org.openremote.model.ContainerService;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.TenantRuleset;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
public class RulesHealthStatusProvider implements HealthStatusProvider, ContainerService {
@@ -80,7 +80,7 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
}
}
- ObjectNode tenantEngines = Values.createJsonObject();
+ ObjectNode tenantEngines = ValueUtil.createJsonObject();
for (RulesEngine<TenantRuleset> tenantEngine : rulesService.tenantEngines.values()) {
if (!tenantEngine.isRunning()) {
@@ -93,7 +93,7 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
tenantEngines.set(tenantEngine.getId().getRealm().orElse(""), getEngineHealthStatus(tenantEngine));
}
- ObjectNode assetEngines = Values.createJsonObject();
+ ObjectNode assetEngines = ValueUtil.createJsonObject();
for (RulesEngine<AssetRuleset> assetEngine : rulesService.assetEngines.values()) {
if (!assetEngine.isRunning()) {
@@ -107,7 +107,7 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
assetEngines.set(assetEngine.getId().getAssetId().orElse(""), getEngineHealthStatus(assetEngine));
}
- ObjectNode objectValue = Values.createJsonObject();
+ ObjectNode objectValue = ValueUtil.createJsonObject();
objectValue.put("totalEngines", totalEngines);
objectValue.put("stoppedEngines", stoppedEngines);
objectValue.put("errorEngines", errorEngines);
@@ -124,18 +124,18 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
int totalDeployments = rulesEngine.deployments.size();
int executionErrorDeployments = rulesEngine.getExecutionErrorDeploymentCount();
int compilationErrorDeployments = rulesEngine.getExecutionErrorDeploymentCount();
- ObjectNode val = Values.createJsonObject();
+ ObjectNode val = ValueUtil.createJsonObject();
val.put("isRunning", rulesEngine.isRunning());
val.put("isError", isError);
val.put("totalDeployments", totalDeployments);
val.put("executionErrorDeployments", executionErrorDeployments);
val.put("compilationErrorDeployments", compilationErrorDeployments);
- ObjectNode deployments = Values.createJsonObject();
+ ObjectNode deployments = ValueUtil.createJsonObject();
for (Object obj : rulesEngine.deployments.values()) {
RulesetDeployment deployment = (RulesetDeployment)obj;
- ObjectNode dVal = Values.createJsonObject();
+ ObjectNode dVal = ValueUtil.createJsonObject();
dVal.put("name", deployment.getName());
dVal.put("status", deployment.getStatus().name());
dVal.put("error", deployment.getError() != null ? deployment.getError().getMessage() : null);
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index 861bdcff0..e7d43858c 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -38,7 +38,6 @@ import org.openremote.manager.rules.flow.FlowResourceImpl;
import org.openremote.manager.rules.geofence.GeofenceAssetAdapter;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
-import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.asset.Asset;
@@ -53,8 +52,8 @@ import org.openremote.model.rules.geofence.GeofenceDefinition;
import org.openremote.model.security.ClientRole;
import org.openremote.model.security.Tenant;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.MetaItemType;
-import org.openremote.model.value.Values;
import javax.persistence.EntityManager;
import java.util.*;
@@ -475,7 +474,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
// We must load the asset from database (only when required), as the
// persistence event might not contain a completely loaded asset
BiFunction<Asset<?>, Attribute<?>, AssetState<?>> buildAssetState = (loadedAsset, attribute) ->
- new AssetState<>(loadedAsset, Values.clone(attribute), Source.INTERNAL);
+ new AssetState<>(loadedAsset, ValueUtil.clone(attribute), Source.INTERNAL);
switch (persistenceEvent.getCause()) {
case CREATE: {
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index 105a0f019..4100c400a 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -37,7 +37,7 @@ import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.rules.*;
import org.openremote.model.rules.flow.NodeCollection;
import org.openremote.model.util.Pair;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.script.*;
import java.util.ArrayList;
@@ -465,7 +465,7 @@ public class RulesetDeployment {
protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {
try {
flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);
- NodeCollection nodeCollection = Values.JSON.readValue(ruleset.getRules(), NodeCollection.class);
+ NodeCollection nodeCollection = ValueUtil.JSON.readValue(ruleset.getRules(), NodeCollection.class);
flowRulesBuilder.add(nodeCollection);
for (Rule rule : flowRulesBuilder.build()) {
RulesEngine.LOG.info("Registering rule: " + rule.getName());
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
index 7106921f4..c8ab44ce0 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -34,7 +34,7 @@ import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.Ruleset;
import org.openremote.model.rules.TenantRuleset;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -290,7 +290,7 @@ public class RulesetStorageService implements ContainerService {
ruleset.setLastModified(rs.getTimestamp("LAST_MODIFIED"));
ruleset.setCreatedOn(rs.getTimestamp("CREATED_ON"));
if (rs.getString("META") != null) {
- ruleset.setMeta(Values.parse(rs.getString("META"), MetaMap.class).orElse(null));
+ ruleset.setMeta(ValueUtil.parse(rs.getString("META"), MetaMap.class).orElse(null));
}
if (query.fullyPopulate) {
ruleset.setRules(rs.getString("RULES"));
diff --git a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java
index 27269262e..1935f01b6 100644
--- a/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java
+++ b/manager/src/main/java/org/openremote/manager/rules/flow/NodeModel.java
@@ -5,7 +5,7 @@ import org.openremote.manager.rules.RulesEngine;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.rules.AssetState;
import org.openremote.model.rules.flow.*;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.List;
import java.util.Objects;
@@ -21,7 +21,7 @@ public enum NodeModel {
new NodeSocket("value", NodeDataType.ANY)
}),
info -> {
- AttributeInternalValue assetAttributePair = Values.JSON.convertValue(info.getInternals()[0].getValue(), AttributeInternalValue.class);
+ AttributeInternalValue assetAttributePair = ValueUtil.JSON.convertValue(info.getInternals()[0].getValue(), AttributeInternalValue.class);
String assetId = assetAttributePair.getAssetId();
String attributeName = assetAttributePair.getAttributeName();
Optional<AssetState<?>> readValue = info.getFacts().matchFirstAssetState(new AssetQuery().ids(assetId).attributeName(attributeName));
@@ -29,7 +29,7 @@ public enum NodeModel {
return readValue.get().getValue().orElse(null);
},
params -> {
- AttributeInternalValue internal = Values.JSON.convertValue(params.getNode().getInternals()[0].getValue(), AttributeInternalValue.class);
+ AttributeInternalValue internal = ValueUtil.JSON.convertValue(params.getNode().getInternals()[0].getValue(), AttributeInternalValue.class);
String assetId = internal.getAssetId();
String attributeName = internal.getAttributeName();
List<AssetState<?>> allAssets = params.getFacts().matchAssetState(new AssetQuery().ids(assetId).attributeName(attributeName)
@@ -56,7 +56,7 @@ public enum NodeModel {
RulesEngine.LOG.warning("Flow rule error: node " + info.getNode().getName() + " receives invalid value");
return;
}
- AttributeInternalValue assetAttributePair = Values.JSON.convertValue(info.getInternals()[0].getValue(), AttributeInternalValue.class);
+ AttributeInternalValue assetAttributePair = ValueUtil.JSON.convertValue(info.getInternals()[0].getValue(), AttributeInternalValue.class);
Optional<AssetState<?>> existingValue = info.getFacts().matchFirstAssetState(new AssetQuery().ids(assetAttributePair.getAssetId()).attributeName(assetAttributePair.getAttributeName()));
if (existingValue.isPresent())
@@ -137,7 +137,7 @@ public enum NodeModel {
}),
info -> {
try {
- return Values.convert(info.getInternals()[0].getValue(), Double.class);
+ return ValueUtil.convert(info.getInternals()[0].getValue(), Double.class);
} catch (IllegalArgumentException e) {
RulesEngine.RULES_LOG.warning("Number node returned invalid value");
return 0f;
@@ -338,7 +338,7 @@ public enum NodeModel {
}),
info -> {
try {
- boolean condition = Values.convert(info.getValueFromInput(0), Boolean.class);
+ boolean condition = ValueUtil.convert(info.getValueFromInput(0), Boolean.class);
Number a = (Number) info.getValueFromInput(1);
Number b = (Number) info.getValueFromInput(2);
@@ -372,9 +372,9 @@ public enum NodeModel {
}),
info -> {
try {
- Object joiner = Values.convert(info.getInternals()[0].getValue(), String.class);
- Object a = Values.convert(info.getValueFromInput(0), String.class);
- Object b = Values.convert(info.getValueFromInput(1), String.class);
+ Object joiner = ValueUtil.convert(info.getInternals()[0].getValue(), String.class);
+ Object a = ValueUtil.convert(info.getValueFromInput(0), String.class);
+ Object b = ValueUtil.convert(info.getValueFromInput(1), String.class);
joiner = joiner == null ? "" : joiner;
return "" + a + joiner + b;
@@ -392,9 +392,9 @@ public enum NodeModel {
new NodeSocket("output", NodeDataType.STRING),
}),
info -> {
- boolean condition = Values.convert(info.getValueFromInput(0), Boolean.class);
- String a = Values.convert(info.getValueFromInput(1), String.class);
- String b = Values.convert(info.getValueFromInput(2), String.class);
+ boolean condition = ValueUtil.convert(info.getValueFromInput(0), Boolean.class);
+ String a = ValueUtil.convert(info.getValueFromInput(1), String.class);
+ String b = ValueUtil.convert(info.getValueFromInput(2), String.class);
return condition ? a : b;
}),
diff --git a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java
index ee0383bd0..6b69a4661 100644
--- a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java
+++ b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java
@@ -39,7 +39,7 @@ import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.*;
import org.openremote.model.rules.geofence.GeofenceDefinition;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
@@ -260,7 +260,7 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofe
}
List<String> ids = new ArrayList<>(assetIds);
- ObjectNode data = Values.JSON.createObjectNode();
+ ObjectNode data = ValueUtil.JSON.createObjectNode();
data.put("action", "GEOFENCE_REFRESH");
// Break into batches of 10 sent every 10s to avoid consoles bombarding the backend
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 6c851a9bf..8b8d9aa53 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -45,7 +45,7 @@ import org.openremote.model.query.filter.StringPredicate;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.NotAllowedException;
@@ -73,7 +73,7 @@ import static org.openremote.container.web.WebService.WEBSERVER_ALLOWED_ORIGINS_
import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_EMAIL_FROM_KEYCLOAK;
import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT;
import static org.openremote.model.Constants.*;
-import static org.openremote.model.value.Values.convert;
+import static org.openremote.model.util.ValueUtil.convert;
/**
* All keycloak interaction is done through the admin-cli client; security is implemented downstream of here; anything
@@ -804,7 +804,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
try (InputStream is = Files.newInputStream(grantPath)) {
String grantJson = IOUtils.toString(is, StandardCharsets.UTF_8);
- grant = Values.parse(grantJson, OAuthGrant.class).orElseGet(() -> {
+ grant = ValueUtil.parse(grantJson, OAuthGrant.class).orElseGet(() -> {
LOG.info("Failed to load KEYCLOAK_GRANT_FILE: " + grantFile);
return null;
});
@@ -827,7 +827,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
Path grantPath = Paths.get(grantFile);
try {
- Files.write(grantPath, Values.asJSON(grant).orElse("null").getBytes(),
+ Files.write(grantPath, ValueUtil.asJSON(grant).orElse("null").getBytes(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE,
StandardOpenOption.TRUNCATE_EXISTING);
diff --git a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
index 42176d211..6d13d5343 100644
--- a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
@@ -19,7 +19,6 @@
*/
package org.openremote.manager.setup;
-import org.openremote.container.util.UniqueIdentifierGenerator;
import org.openremote.manager.asset.AssetProcessingService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.datapoint.AssetDatapointService;
@@ -31,14 +30,13 @@ import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.apps.ConsoleAppConfig;
import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.agent.Agent;
import org.openremote.model.asset.agent.AgentLink;
import org.openremote.model.asset.impl.*;
import org.openremote.model.attribute.*;
import org.openremote.model.geo.GeoJSONPoint;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueFormat;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import jline.internal.Log;
@@ -46,10 +44,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.time.DayOfWeek;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -473,7 +467,7 @@ public class ManagerSetup implements Setup {
Files.list(Paths.get(provisionDocRoot.toString(), "consoleappconfig")).filter(Files::isRegularFile)
.forEach(file -> {
try {
- ConsoleAppConfig config = Values.JSON.readValue(file.toFile(), ConsoleAppConfig.class);
+ ConsoleAppConfig config = ValueUtil.JSON.readValue(file.toFile(), ConsoleAppConfig.class);
persistenceService.doTransaction(entityManager -> entityManager.merge(config));
Log.info("Console app config added for realm: " + config.getRealm());
@@ -495,7 +489,7 @@ public class ManagerSetup implements Setup {
Files.list(Paths.get(provisionDocRoot.toString(), "assets")).sorted()
.forEach(file -> {
try {
- Asset<?> asset = Values.JSON.readValue(file.toFile(), Asset.class);
+ Asset<?> asset = ValueUtil.JSON.readValue(file.toFile(), Asset.class);
asset = assetStorageService.merge(asset);
Log.info("Asset merged: " + asset.toString());
diff --git a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java
index cb07bf71a..4cd1d972e 100644
--- a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@@ -67,7 +67,7 @@ public class JvmHealthStatusProvider implements HealthStatusProvider, ContainerS
@Override
public Object getHealthStatus() {
- ObjectNode objectValue = Values.createJsonObject();
+ ObjectNode objectValue = ValueUtil.createJsonObject();
com.sun.management.OperatingSystemMXBean operatingSystemMXBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
diff --git a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java
index cc5f909f7..1877ace3c 100644
--- a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.net.ssl.*;
import javax.ws.rs.core.UriBuilder;
@@ -105,7 +105,7 @@ public class SslHealthStatusProvider implements X509TrustManager, HealthStatusPr
Date date = serverCert.getNotAfter();
long validDays = DAYS.between(Instant.now(), date.toInstant());
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
objectValue.put("validDays", validDays);
return objectValue;
} catch (IOException e) {
diff --git a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
index 9e131b2e5..490cb3e18 100644
--- a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
@@ -22,7 +22,7 @@ package org.openremote.manager.system;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.system.HealthStatusProvider;
import org.openremote.model.system.StatusResource;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.IOException;
import java.io.InputStream;
@@ -50,10 +50,10 @@ public class StatusResourceImpl implements StatusResource {
@Override
public ObjectNode getHealthStatus() {
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
healthStatusProviderList.forEach(healthStatusProvider -> {
- ObjectNode providerValue = Values.JSON.createObjectNode();
+ ObjectNode providerValue = ValueUtil.JSON.createObjectNode();
providerValue.put("version", healthStatusProvider.getHealthStatusVersion());
providerValue.putPOJO("data", healthStatusProvider.getHealthStatus());
objectValue.set(healthStatusProvider.getHealthStatusName(), providerValue);
@@ -66,7 +66,7 @@ public class StatusResourceImpl implements StatusResource {
@Override
public ObjectNode getInfo() {
String version = versionProps.getProperty("version");
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
objectValue.put("version", version);
return objectValue;
}
diff --git a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java
index 122d3d5e8..d990742fc 100644
--- a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.system.HealthStatusProvider;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.File;
import java.lang.management.ManagementFactory;
@@ -65,7 +65,7 @@ public class SystemHealthStatusProvider implements HealthStatusProvider, Contain
@Override
public Object getHealthStatus() {
- ObjectNode objectValue = Values.JSON.createObjectNode();
+ ObjectNode objectValue = ValueUtil.JSON.createObjectNode();
com.sun.management.OperatingSystemMXBean operatingSystemMXBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
File[] roots = File.listRoots();
@@ -76,10 +76,10 @@ public class SystemHealthStatusProvider implements HealthStatusProvider, Contain
objectValue.put("totalSwapSpaceMB", operatingSystemMXBean.getTotalSwapSpaceSize() / (1024F*1024F));
objectValue.put("freeSwapSpaceMB", operatingSystemMXBean.getFreeSwapSpaceSize() / (1024F*1024F));
- ObjectNode rootsObj = Values.JSON.createObjectNode();
+ ObjectNode rootsObj = ValueUtil.JSON.createObjectNode();
for (File root : roots) {
- ObjectNode rootObj = Values.JSON.createObjectNode();
+ ObjectNode rootObj = ValueUtil.JSON.createObjectNode();
rootObj.put("totalSpaceMB", root.getTotalSpace() / (1024F*1024F));
rootObj.put("freeSpaceMB", root.getFreeSpace() / (1024F*1024F));
String name = root.getAbsolutePath();
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index f1091ee55..a724142a3 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -21,11 +21,8 @@ package org.openremote.manager.web;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.core.util.Json;
-import io.swagger.v3.jaxrs2.integration.JaxrsOpenApiContextBuilder;
import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
-import io.swagger.v3.oas.integration.OpenApiConfigurationException;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
-import io.swagger.v3.oas.integration.api.ObjectMapperProcessor;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Contact;
import io.swagger.v3.oas.models.info.Info;
@@ -47,15 +44,12 @@ import org.jboss.resteasy.spi.ResteasyDeployment;
import org.openremote.container.security.IdentityService;
import org.openremote.container.web.WebService;
import org.openremote.model.Container;
-import org.openremote.model.security.ClientRole;
-import javax.servlet.ServletException;
import javax.ws.rs.WebApplicationException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -70,7 +64,7 @@ import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.UriBuilder.fromUri;
import static org.openremote.container.util.MapAccess.getString;
import static org.openremote.model.Constants.REQUEST_HEADER_REALM;
-import static org.openremote.model.value.Values.configureObjectMapper;
+import static org.openremote.model.util.ValueUtil.configureObjectMapper;
public class ManagerWebService extends WebService {
diff --git a/model/src/main/java/org/openremote/model/AssetModelProvider.java b/model/src/main/java/org/openremote/model/AssetModelProvider.java
index 5889b9c18..e194fe136 100644
--- a/model/src/main/java/org/openremote/model/AssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/AssetModelProvider.java
@@ -25,16 +25,16 @@ import org.openremote.model.util.TsIgnore;
import org.openremote.model.value.AttributeDescriptor;
import org.openremote.model.value.MetaItemDescriptor;
import org.openremote.model.value.ValueDescriptor;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
/**
- * Provides model descriptors that are processed by {@link Values}; implementations can be discovered using the
+ * Provides model descriptors that are processed by {@link ValueUtil}; implementations can be discovered using the
* standard {@link ServiceLoader} mechanism or can be manually registered by adding an instance to the {@link
- * Values#getModelProviders}.
+ * ValueUtil#getModelProviders}.
* <p>
* If {@link #useAutoScan} is true then the {@link org.reflections.Reflections} library is used to find all classes that
* extend {@link Asset} in the same JAR as the {@link AssetModelProvider}, these are then searched for all types of
@@ -62,14 +62,14 @@ public interface AssetModelProvider {
/**
* Get {@link AttributeDescriptor}s that should be associated with the specified {@link Asset} type; these are
* combined with any {@link AttributeDescriptor}s already associated with the given {@link Asset} type. Any
- * duplicate conflicts will generate an {@link IllegalStateException} during {@link Values} initialisation.
+ * duplicate conflicts will generate an {@link IllegalStateException} during {@link ValueUtil} initialisation.
*/
Map<Class<? extends Asset<?>>, List<AttributeDescriptor<?>>> getAttributeDescriptors();
/**
* Get {@link MetaItemDescriptor}s that should be associated with the specified {@link Asset} type; these are
* combined with any {@link MetaItemDescriptor}s already associated with the given {@link Asset} type. Any duplicate
- * conflicts will generate an {@link IllegalStateException} during {@link Values} initialisation.
+ * conflicts will generate an {@link IllegalStateException} during {@link ValueUtil} initialisation.
* <p>
* If {@link #useAutoScan} is true and this is also defined then the results will be combined with those returned by
* scanning.
@@ -79,7 +79,7 @@ public interface AssetModelProvider {
/**
* Get {@link ValueDescriptor}s that should be associated with the specified {@link Asset} type; these are combined
* with any {@link ValueDescriptor}s already associated with the given {@link Asset} type. Any duplicate conflicts
- * will generate an {@link IllegalStateException} during {@link Values} initialisation. Shouldn't contain
+ * will generate an {@link IllegalStateException} during {@link ValueUtil} initialisation. Shouldn't contain
* any {@link ValueDescriptor}s of type array (i.e. ones obtained by calling {@link ValueDescriptor#asArray} or ones
* where {@link ValueDescriptor#getType} returns a class that {@link Class#isArray} returns true for.
* <p>
diff --git a/model/src/main/java/org/openremote/model/StandardModelProvider.java b/model/src/main/java/org/openremote/model/StandardModelProvider.java
index 6daec5f76..7ddba19cc 100644
--- a/model/src/main/java/org/openremote/model/StandardModelProvider.java
+++ b/model/src/main/java/org/openremote/model/StandardModelProvider.java
@@ -23,6 +23,7 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TsIgnore;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.*;
import java.util.*;
@@ -70,7 +71,7 @@ public class StandardModelProvider implements AssetModelProvider {
public void onAssetModelFinished() {
// Inject allowed asset types into GroupAsset
List<ValueConstraint> constraints = ValueType.ASSET_TYPE.getConstraints() != null ? new ArrayList<>(Arrays.asList(ValueType.ASSET_TYPE.getConstraints())): new ArrayList<>();
- constraints.add(new ValueConstraint.AllowedValues(Arrays.stream(Values.getAssetClasses(null)).map(Class::getSimpleName).toArray()));
+ constraints.add(new ValueConstraint.AllowedValues(Arrays.stream(ValueUtil.getAssetClasses(null)).map(Class::getSimpleName).toArray()));
ValueType.ASSET_TYPE.updateConstraints(constraints.toArray(new ValueConstraint[0]));
}
}
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index cb471dc4b..7b7452ec4 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -37,7 +37,7 @@ import org.openremote.model.util.TsIgnore;
import org.openremote.model.validation.AssetValid;
import org.openremote.model.value.AttributeDescriptor;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import javax.persistence.*;
import javax.validation.Valid;
@@ -324,7 +324,7 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>
setName(name);
// Initialise required attributes
- Values.initialiseAssetAttributes(this);
+ ValueUtil.initialiseAssetAttributes(this);
}
public String getId() {
@@ -570,7 +570,7 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>
return "[" +
meta.entrySet().stream().map(nameAndValue ->
- "meta=" + nameAndValue.getKey() + ",value=" + Values.asJSON(nameAndValue.getValue().getValue()).orElse(null)).collect(Collectors.joining("; ")) +
+ "meta=" + nameAndValue.getKey() + ",value=" + ValueUtil.asJSON(nameAndValue.getValue().getValue()).orElse(null)).collect(Collectors.joining("; ")) +
"]";
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
index cbef7f825..53cf4df21 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import org.openremote.model.asset.agent.AgentDescriptor;
import org.openremote.model.util.TsIgnore;
import org.openremote.model.value.NameHolder;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.IOException;
@@ -70,7 +70,7 @@ public class AssetDescriptor<T extends Asset<?>> implements NameHolder {
} else if (node.isObject()) {
name = node.get("name").asText();
}
- return Values.getAssetDescriptor(name).orElse(null);
+ return ValueUtil.getAssetDescriptor(name).orElse(null);
}
}
diff --git a/model/src/main/java/org/openremote/model/asset/agent/Agent.java b/model/src/main/java/org/openremote/model/asset/agent/Agent.java
index 4f5158b4d..af20f31e9 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/Agent.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/Agent.java
@@ -25,10 +25,10 @@ import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.MetaItem;
import org.openremote.model.auth.OAuthGrant;
import org.openremote.model.auth.UsernamePassword;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.AttributeDescriptor;
import org.openremote.model.value.MetaItemType;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.Arrays;
import java.util.Optional;
@@ -261,12 +261,12 @@ public abstract class Agent<T extends Agent<T, U, V>, U extends Protocol<T>, V e
// This is an event for an agent so is it for an attribute that has a descriptor which is defined in an agent class
// and it's not the status attribute (or we'll end up in a loop)
return !attributeName.equals(Agent.STATUS.getName())
- && Values.getAssetInfo(getType())
+ && ValueUtil.getAssetInfo(getType())
.map(info ->
Arrays.stream(info.getAttributeDescriptors())
.anyMatch(ad -> ad.getName().equals(attributeName)))
.orElse(false)
- && Values.getAssetInfo(UnknownAsset.class)
+ && ValueUtil.getAssetInfo(UnknownAsset.class)
.map(typeInfo -> Arrays.stream(typeInfo.getAttributeDescriptors()).noneMatch(ad -> ad.getName().equals(attributeName)))
.orElse(false);
}
diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
index 00417de4e..dd1a8ee91 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
@@ -22,7 +22,6 @@ package org.openremote.model.asset.agent;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.util.StdConverter;
import org.openremote.model.asset.Asset;
@@ -30,7 +29,6 @@ import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.protocol.ProtocolAssetDiscovery;
import org.openremote.model.protocol.ProtocolAssetImport;
import org.openremote.model.protocol.ProtocolInstanceDiscovery;
-import org.openremote.model.value.Values;
/**
* Special type of {@link AssetDescriptor} that describes an agent {@link Asset}.
diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
index 7ea7197d8..cdbb4e1df 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.query.filter.ValuePredicate;
import org.openremote.model.value.ValueFilter;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.Serializable;
import java.util.Optional;
@@ -142,7 +142,7 @@ public abstract class AgentLink<T extends AgentLink<?>> implements Serializable
public static <T> T getOrThrowAgentLinkProperty(Optional<T> value, String name) {
return value.orElseThrow(() -> {
String msg = "Required agent link property is undefined: " + name;
- Values.LOG.warning(msg);
+ ValueUtil.LOG.warning(msg);
return new IllegalStateException("msg");
});
}
diff --git a/model/src/main/java/org/openremote/model/asset/agent/Protocol.java b/model/src/main/java/org/openremote/model/asset/agent/Protocol.java
index 4d6b0fe9e..4ce10aab8 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/Protocol.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/Protocol.java
@@ -29,7 +29,7 @@ import org.openremote.model.attribute.MetaItem;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.value.MetaItemType;
import org.openremote.model.value.ValueFilter;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Map;
import java.util.logging.Logger;
@@ -92,7 +92,7 @@ import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;
* way before being written to the linked attribute (see {@link AgentLink#getValueConverter})</li>
* <li>Automatic basic value conversion should be performed when the type of the value produced by the
* protocol and any configured value conversion does not match the linked attributes underlying value type; this
- * basic conversion should use the {@link Values#convert} method</li>
+ * basic conversion should use the {@link ValueUtil#convert} method</li>
* </ol>
* <h1>Outbound value conversion (Linked Attribute -> Protocol)</h1>
* Standard value conversion should be performed in the following order:
diff --git a/model/src/main/java/org/openremote/model/attribute/Attribute.java b/model/src/main/java/org/openremote/model/attribute/Attribute.java
index 063884dc3..41d3e7020 100644
--- a/model/src/main/java/org/openremote/model/attribute/Attribute.java
+++ b/model/src/main/java/org/openremote/model/attribute/Attribute.java
@@ -31,6 +31,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.util.TokenBuffer;
import org.openremote.model.asset.Asset;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.*;
import javax.validation.Valid;
@@ -90,7 +91,7 @@ public class Attribute<T> extends AbstractNameValueHolder<T> implements MetaHold
}
// Get inner attribute type or fallback to primitive/JSON type
- Optional<ValueDescriptor<?>> valueDescriptor = Values.getValueDescriptor(attributeValueType);
+ Optional<ValueDescriptor<?>> valueDescriptor = ValueUtil.getValueDescriptor(attributeValueType);
Attribute attribute = new Attribute<>();
while (jp3.nextToken() != JsonToken.END_OBJECT) {
@@ -126,7 +127,7 @@ public class Attribute<T> extends AbstractNameValueHolder<T> implements MetaHold
return ValueDescriptor.UNKNOWN;
}
Object value = attribute.value;
- return Values.getValueDescriptorForValue(value);
+ return ValueUtil.getValueDescriptorForValue(value);
});
return (Attribute<?>) attribute;
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaMap.java b/model/src/main/java/org/openremote/model/attribute/MetaMap.java
index e74ddf398..0e8676cf4 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaMap.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaMap.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.*;
import java.io.IOException;
@@ -61,7 +62,7 @@ public class MetaMap extends NamedMap<MetaItem<?>> {
// Find the meta descriptor for this meta item as this will give us value type also; fallback to
// OBJECT type meta item to allow deserialization of meta that doesn't exist in the current asset model
- Optional<ValueDescriptor<?>> valueDescriptor = Values.getMetaItemDescriptor(metaItemName)
+ Optional<ValueDescriptor<?>> valueDescriptor = ValueUtil.getMetaItemDescriptor(metaItemName)
.map(MetaItemDescriptor::getType);
Class valueType = valueDescriptor.map(ValueDescriptor::getType).orElseGet(() -> (Class) Object.class);
@@ -73,7 +74,7 @@ public class MetaMap extends NamedMap<MetaItem<?>> {
return ValueDescriptor.UNKNOWN;
}
Object value = metaItem.getValue().orElse(null);
- return Values.getValueDescriptorForValue(value);
+ return ValueUtil.getValueDescriptorForValue(value);
}));
list.add(metaItem);
diff --git a/model/src/main/java/org/openremote/model/flow/catalog/NodeDescriptor.java b/model/src/main/java/org/openremote/model/flow/catalog/NodeDescriptor.java
index 9de7cf427..016fe15d8 100644
--- a/model/src/main/java/org/openremote/model/flow/catalog/NodeDescriptor.java
+++ b/model/src/main/java/org/openremote/model/flow/catalog/NodeDescriptor.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Supplier;
-import static org.openremote.model.value.Values.JSON;
+import static org.openremote.model.util.ValueUtil.JSON;
public abstract class NodeDescriptor {
diff --git a/model/src/main/java/org/openremote/model/flow/catalog/WidgetNodeDescriptor.java b/model/src/main/java/org/openremote/model/flow/catalog/WidgetNodeDescriptor.java
index 533c0e150..b6fc4e262 100644
--- a/model/src/main/java/org/openremote/model/flow/catalog/WidgetNodeDescriptor.java
+++ b/model/src/main/java/org/openremote/model/flow/catalog/WidgetNodeDescriptor.java
@@ -24,7 +24,7 @@ package org.openremote.model.flow.catalog;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.flow.Node;
import org.openremote.model.flow.Slot;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Arrays;
import java.util.List;
@@ -38,7 +38,7 @@ public abstract class WidgetNodeDescriptor extends ConsoleNodeDescriptor {
public static final String PROPERTY_COMPONENT = "component";
public static final String WIDGET_EDITOR_COMPONENT = "or-node-editor-widget";
- public static final ObjectNode WIDGET_INITIAL_PROPERTIES = Values.JSON.createObjectNode()
+ public static final ObjectNode WIDGET_INITIAL_PROPERTIES = ValueUtil.JSON.createObjectNode()
.put("positionX", 25)
.put("positionY", 25)
.put("positionZ", 0)
diff --git a/model/src/main/java/org/openremote/model/flow/catalog/console/ScreenNodeDescriptor.java b/model/src/main/java/org/openremote/model/flow/catalog/console/ScreenNodeDescriptor.java
index 94749bc68..7e8f27e1c 100644
--- a/model/src/main/java/org/openremote/model/flow/catalog/console/ScreenNodeDescriptor.java
+++ b/model/src/main/java/org/openremote/model/flow/catalog/console/ScreenNodeDescriptor.java
@@ -25,7 +25,7 @@ import org.openremote.model.flow.Slot;
import org.openremote.model.flow.catalog.CatalogCategory;
import org.openremote.model.flow.catalog.ConsoleNodeDescriptor;
import org.openremote.model.flow.catalog.WidgetNodeDescriptor;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.List;
import java.util.function.Supplier;
@@ -38,7 +38,7 @@ public class ScreenNodeDescriptor extends ConsoleNodeDescriptor {
public static final String WIDGET_COMPONENT = "or-console-widget-screen";
public static final String EDITOR_COMPONENT = "or-node-editor-screen";
- public static final ObjectNode SCREEN_INITIAL_PROPERTIES = Values.JSON.createObjectNode()
+ public static final ObjectNode SCREEN_INITIAL_PROPERTIES = ValueUtil.JSON.createObjectNode()
.put(WidgetNodeDescriptor.PROPERTY_COMPONENT, WIDGET_COMPONENT)
.put("backgroundColor", "#aaa")
.put("textColor", "white");
diff --git a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
index 8dfb31030..f56932869 100644
--- a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
+++ b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
@@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.util.StdConverter;
import com.vividsolutions.jts.geom.Coordinate;
-import net.minidev.json.JSONArray;
-import org.openremote.model.value.Values;
import static org.openremote.model.geo.GeoJSONPoint.TYPE;
diff --git a/model/src/main/java/org/openremote/model/jackson/AssetTypeIdResolver.java b/model/src/main/java/org/openremote/model/jackson/AssetTypeIdResolver.java
index 0e466764a..545810063 100644
--- a/model/src/main/java/org/openremote/model/jackson/AssetTypeIdResolver.java
+++ b/model/src/main/java/org/openremote/model/jackson/AssetTypeIdResolver.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.impl.UnknownAsset;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.io.IOException;
@@ -59,7 +59,7 @@ public class AssetTypeIdResolver extends TypeIdResolverBase {
@Override
public JavaType typeFromId(DatabindContext context, String id) throws IOException {
- AssetDescriptor<?> descriptor = Values.getAssetDescriptor(id).orElse(UnknownAsset.DESCRIPTOR);
+ AssetDescriptor<?> descriptor = ValueUtil.getAssetDescriptor(id).orElse(UnknownAsset.DESCRIPTOR);
return context.constructType(descriptor.getType());
}
}
diff --git a/model/src/main/java/org/openremote/model/notification/EmailNotificationMessage.java b/model/src/main/java/org/openremote/model/notification/EmailNotificationMessage.java
index 22047e21e..fb16a1451 100644
--- a/model/src/main/java/org/openremote/model/notification/EmailNotificationMessage.java
+++ b/model/src/main/java/org/openremote/model/notification/EmailNotificationMessage.java
@@ -21,8 +21,6 @@ package org.openremote.model.notification;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.openremote.model.util.TextUtil;
-import org.openremote.model.value.Values;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/model/src/main/java/org/openremote/model/notification/PushNotificationButton.java b/model/src/main/java/org/openremote/model/notification/PushNotificationButton.java
index e94325954..63ad6687b 100644
--- a/model/src/main/java/org/openremote/model/notification/PushNotificationButton.java
+++ b/model/src/main/java/org/openremote/model/notification/PushNotificationButton.java
@@ -21,7 +21,6 @@ package org.openremote.model.notification;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.openremote.model.value.Values;
/**
* Represents an action button that can be shown on push alerts (dependent on console support)
diff --git a/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java b/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java
index 8f8964cd6..7608f421c 100644
--- a/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java
+++ b/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java
@@ -33,9 +33,9 @@ import org.openremote.model.query.filter.ValuePredicate;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.TsIgnore;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueFilter;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.Locale;
import java.util.Optional;
@@ -45,8 +45,8 @@ import java.util.function.Supplier;
import java.util.logging.Level;
import static org.openremote.model.asset.agent.Protocol.DYNAMIC_VALUE_PLACEHOLDER;
-import static org.openremote.model.value.Values.NULL_LITERAL;
-import static org.openremote.model.value.Values.applyValueFilters;
+import static org.openremote.model.util.ValueUtil.NULL_LITERAL;
+import static org.openremote.model.util.ValueUtil.applyValueFilters;
@TsIgnore
public final class ProtocolUtil {
@@ -94,7 +94,7 @@ public final class ProtocolUtil {
// Check if attribute type is executable
if (attribute.getType().equals(ValueType.EXECUTION_STATUS)) {
- AttributeExecuteStatus status = Values.getValueCoerced(value, AttributeExecuteStatus.class).orElse(null);
+ AttributeExecuteStatus status = ValueUtil.getValueCoerced(value, AttributeExecuteStatus.class).orElse(null);
if (status == AttributeExecuteStatus.REQUEST_START && writeValue != null) {
value = writeValue;
@@ -121,7 +121,7 @@ public final class ProtocolUtil {
if (hasWriteValue) {
if (containsDynamicPlaceholder) {
- String valueStr = value == null ? NULL_LITERAL : Values.convert(value, String.class);
+ String valueStr = value == null ? NULL_LITERAL : ValueUtil.convert(value, String.class);
writeValue = writeValue.replaceAll(Protocol.DYNAMIC_VALUE_PLACEHOLDER_REGEXP, valueStr);
}
@@ -147,7 +147,7 @@ public final class ProtocolUtil {
// value filtering
agentLink.getValueFilters().ifPresent(valueFilters -> {
Protocol.LOG.finer("Applying attribute value filters to attribute: assetId=" + assetId + ", attribute=" + attribute.getName());
- Object o = Values.applyValueFilters(value, valueFilters);
+ Object o = ValueUtil.applyValueFilters(value, valueFilters);
if (o == null) {
Protocol.LOG.info("Value filters generated a null value for attribute: assetId=" + assetId + ", attribute=" + attribute.getName());
}
@@ -174,7 +174,7 @@ public final class ProtocolUtil {
if (toType != fromType) {
Protocol.LOG.finer("Applying built in attribute value conversion: " + fromType + " -> " + toType);
- valRef.set(Values.getValueCoerced(valRef.get(), toType).orElse(null));
+ valRef.set(ValueUtil.getValueCoerced(valRef.get(), toType).orElse(null));
if (valRef.get() == null) {
Protocol.LOG.warning("Failed to convert value: " + fromType + " -> " + toType);
@@ -193,7 +193,7 @@ public final class ProtocolUtil {
return new Pair<>(false, value);
}
- String converterKey = Values.getValueCoerced(value, String.class).map(str -> str.toUpperCase(Locale.ROOT)).orElse(NULL_LITERAL.toUpperCase());
+ String converterKey = ValueUtil.getValueCoerced(value, String.class).map(str -> str.toUpperCase(Locale.ROOT)).orElse(NULL_LITERAL.toUpperCase());
return Optional.ofNullable(converter.get(converterKey))
.map(node -> {
@@ -213,11 +213,11 @@ public final class ProtocolUtil {
.map(node -> {
if (node.getNodeType() == JsonNodeType.STRING) {
if (AttributeLink.ConverterType.NEGATE.getValue().equals(node.textValue())) {
- if (Values.isNumber(value.getClass())) {
- return new Pair<>(false, (Values.getValueCoerced(value, Double.class).orElse(0D) * -1));
+ if (ValueUtil.isNumber(value.getClass())) {
+ return new Pair<>(false, (ValueUtil.getValueCoerced(value, Double.class).orElse(0D) * -1));
}
- if (Values.isBoolean(value.getClass())) {
- return new Pair<>(false, !(Values.getValueCoerced(value, Boolean.class).orElse(false)));
+ if (ValueUtil.isBoolean(value.getClass())) {
+ return new Pair<>(false, !(ValueUtil.getValueCoerced(value, Boolean.class).orElse(false)));
}
}
}
diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.java
index 6261574d9..01836a1f6 100644
--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java
+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java
@@ -26,7 +26,7 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.agent.Agent;
import org.openremote.model.query.filter.*;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Arrays;
import java.util.Comparator;
@@ -248,7 +248,7 @@ public class AssetQuery {
return (Class<? extends Asset<?>>)(Class<?>) Asset.class;
}
- return Values.getAssetDescriptor(value).map(AssetDescriptor::getType).orElse(null);
+ return ValueUtil.getAssetDescriptor(value).map(AssetDescriptor::getType).orElse(null);
}
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java
index 28bdb4843..9481494bc 100644
--- a/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java
@@ -21,7 +21,7 @@ package org.openremote.model.query.filter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Arrays;
import java.util.Objects;
@@ -98,12 +98,12 @@ public class ArrayPredicate extends ValuePredicate {
@Override
public Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier) {
return obj -> {
- if (obj == null || !Values.isArray(obj.getClass())) {
+ if (obj == null || !ValueUtil.isArray(obj.getClass())) {
return false;
}
@SuppressWarnings("OptionalGetWithoutIsPresent")
- Object[] arrayValue = Values.getValueCoerced(obj, Object[].class).get();
+ Object[] arrayValue = ValueUtil.getValueCoerced(obj, Object[].class).get();
boolean result = true;
if (value != null) {
diff --git a/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java b/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java
index 345822bdf..9cbc55e76 100644
--- a/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java
@@ -19,7 +19,7 @@
*/
package org.openremote.model.query.filter;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -44,7 +44,7 @@ public class BooleanPredicate extends ValuePredicate {
@Override
public Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier) {
return obj -> {
- Boolean bool = Values.getValueCoerced(obj, Boolean.class).orElse(null);
+ Boolean bool = ValueUtil.getValueCoerced(obj, Boolean.class).orElse(null);
if (bool == null) {
return false;
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
index a6aff4034..17fae85aa 100644
--- a/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
@@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.util.Pair;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
import java.util.Date;
import java.util.function.Predicate;
@@ -52,7 +52,7 @@ public class CalendarEventPredicate extends ValuePredicate {
return true;
}
- return Values.getValueCoerced(obj, CalendarEvent.class).map(calendarEvent -> {
+ return ValueUtil.getValueCoerced(obj, CalendarEvent.class).map(calendarEvent -> {
Date when = timestamp;
Pair<Long, Long> nextOrActive = calendarEvent.getNextOrActiveFromTo(when);
diff --git a/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java b/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
index 6db1ff1c0..e5fc9d370 100644
--- a/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
@@ -22,7 +22,7 @@ package org.openremote.model.query.filter;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TimeUtil;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Date;
import java.util.function.Predicate;
@@ -79,7 +79,7 @@ public class DateTimePredicate extends ValuePredicate {
@Override
public Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier) {
return obj ->
- Values.getValueCoerced(obj, Date.class).map(date -> {
+ ValueUtil.getValueCoerced(obj, Date.class).map(date -> {
Pair<Long, Long> fromAndTo = asFromAndTo(currentMillisSupplier.get());
Long from = fromAndTo.key;
Long to = fromAndTo.value;
diff --git a/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java b/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java
index f8836f1ef..bdf80d7ff 100644
--- a/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java
@@ -21,7 +21,7 @@ package org.openremote.model.query.filter;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.util.NumberComparator;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -71,7 +71,7 @@ public class NumberPredicate extends ValuePredicate {
@Override
public Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier) {
return obj ->
- Values.getValueCoerced(obj, Number.class).map(number -> {
+ ValueUtil.getValueCoerced(obj, Number.class).map(number -> {
boolean result = operator.compare(comparator, number, value, rangeValue);
return negate != result;
}).orElse(false);
diff --git a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
index a0965acc8..4741d731e 100644
--- a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.vividsolutions.jts.geom.Coordinate;
import org.geotools.referencing.GeodeticCalculator;
import org.openremote.model.geo.GeoJSONPoint;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Objects;
import java.util.function.Predicate;
@@ -104,7 +104,7 @@ public class RadialGeofencePredicate extends GeofencePredicate {
if (obj instanceof Coordinate) {
coordinate = (Coordinate)obj;
} else {
- coordinate = Values.getValue(obj, GeoJSONPoint.class).map(GeoJSONPoint::getCoordinates).orElse(null);
+ coordinate = ValueUtil.getValue(obj, GeoJSONPoint.class).map(GeoJSONPoint::getCoordinates).orElse(null);
}
if (coordinate == null) {
diff --git a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
index 1699c974d..104198fca 100644
--- a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
import org.openremote.model.geo.GeoJSONPoint;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import java.util.Objects;
import java.util.function.Predicate;
@@ -114,7 +114,7 @@ public class RectangularGeofencePredicate extends GeofencePredicate {
if (obj instanceof Coordinate) {
coordinate = (Coordinate)obj;
} else {
- coordinate = Values.getValue(obj, GeoJSONPoint.class).map(GeoJSONPoint::getCoordinates).orElse(null);
+ coordinate = ValueUtil.getValue(obj, GeoJSONPoint.class).map(GeoJSONPoint::getCoordinates).orElse(null);
}
if (coordinate == null) {
diff --git a/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java b/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java
index dbabe3576..bf4366ea7 100644
--- a/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java
@@ -21,9 +21,8 @@ package org.openremote.model.query.filter;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.value.NameHolder;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
-import java.io.Serializable;
import java.util.Locale;
import java.util.Objects;
import java.util.function.Predicate;
@@ -62,7 +61,7 @@ public class StringPredicate extends ValuePredicate {
public Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier) {
return obj -> {
- String string = Values.getValueCoerced(obj, String.class).orElse(null);
+ String string = ValueUtil.getValueCoerced(obj, String.class).orElse(null);
if (string == null && value == null)
return !negate;
diff --git a/model/src/main/java/org/openremote/model/rules/AssetState.java b/model/src/main/java/org/openremote/model/rules/AssetState.java
index bbeed7f7b..790b4e7e1 100644
--- a/model/src/main/java/org/openremote/model/rules/AssetState.java
+++ b/model/src/main/java/org/openremote/model/rules/AssetState.java
@@ -26,6 +26,7 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.MetaMap;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.*;
import java.util.Date;
@@ -117,7 +118,7 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolder
@Override
public <U> Optional<U> getValueAs(Class<U> valueType) {
- return Values.getValueCoerced(value, valueType);
+ return ValueUtil.getValueCoerced(value, valueType);
}
@Override
diff --git a/model/src/main/java/org/openremote/model/value/Values.java b/model/src/main/java/org/openremote/model/util/ValueUtil.java
similarity index 97%
rename from model/src/main/java/org/openremote/model/value/Values.java
rename to model/src/main/java/org/openremote/model/util/ValueUtil.java
index 04fee6511..490160a4a 100644
--- a/model/src/main/java/org/openremote/model/value/Values.java
+++ b/model/src/main/java/org/openremote/model/util/ValueUtil.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.openremote.model.value;
+package org.openremote.model.util;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonCreator;
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
import com.github.victools.jsonschema.generator.*;
import com.github.victools.jsonschema.module.jackson.JacksonModule;
import com.github.victools.jsonschema.module.jackson.JacksonOption;
-import com.github.victools.jsonschema.module.javax.validation.JavaxValidationModule;
import com.github.victools.jsonschema.module.swagger2.Swagger2Module;
import org.hibernate.internal.util.SerializationHelper;
import org.openremote.model.AssetModelProvider;
@@ -46,9 +45,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;
import org.openremote.model.asset.agent.AgentLink;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.syslog.SyslogCategory;
-import org.openremote.model.util.ModelIgnore;
-import org.openremote.model.util.TextUtil;
-import org.openremote.model.util.TsIgnore;
+import org.openremote.model.value.*;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
@@ -86,11 +83,11 @@ import static org.openremote.model.syslog.SyslogCategory.MODEL_AND_VALUES;
* Custom descriptors can be added by simply adding new {@link Asset}/{@link Agent} sub types and following the discovery
* rules described in {@link StandardModelProvider}; alternatively a custom {@link AssetModelProvider} implementation
* can be created and discovered with the {@link ServiceLoader} or manually added to this class via
- * {@link Values#getModelProviders()} collection.
+ * {@link ValueUtil#getModelProviders()} collection.
*/
@SuppressWarnings({"unchecked", "deprecation"})
@TsIgnore
-public class Values {
+public class ValueUtil {
/**
* Copied from: https://puredanger.github.io/tech.puredanger.com/2006/11/29/writing-a-class-hierarchy-comparator/
@@ -132,7 +129,7 @@ public class Values {
}
// Preload the Standard model provider so it takes priority over others
- public static Logger LOG = SyslogCategory.getLogger(MODEL_AND_VALUES, Values.class);
+ public static Logger LOG = SyslogCategory.getLogger(MODEL_AND_VALUES, ValueUtil.class);
public static ObjectMapper JSON;
protected static List<AssetModelProvider> assetModelProviders = new ArrayList<>(Collections.singletonList(new StandardModelProvider()));
protected static Map<Class<? extends Asset<?>>, AssetTypeInfo> assetInfoMap;
@@ -145,7 +142,7 @@ public class Values {
static {
// Find all service loader registered asset model providers
- ServiceLoader.load(AssetModelProvider.class).forEach(Values.assetModelProviders::add);
+ ServiceLoader.load(AssetModelProvider.class).forEach(ValueUtil.assetModelProviders::add);
initialise();
}
@@ -225,7 +222,7 @@ public class Values {
}
@SuppressWarnings("rawtypes")
- protected static <T> Optional<T> getValue(Object value, Class<T> type, boolean coerce) {
+ public static <T> Optional<T> getValue(Object value, Class<T> type, boolean coerce) {
if (value == null) {
return Optional.empty();
}
@@ -390,7 +387,7 @@ public class Values {
}
public static ObjectNode createJsonObject() {
- return Values.JSON.createObjectNode();
+ return ValueUtil.JSON.createObjectNode();
}
public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
@@ -1016,13 +1013,13 @@ public class Values {
});
attributeDescriptors.add((AttributeDescriptor<?>) descriptor);
} else if (descriptor instanceof MetaItemDescriptor) {
- int index = Values.metaItemDescriptors.indexOf(descriptor);
- if (index >= 0 && Values.metaItemDescriptors.get(index) != descriptor) {
+ int index = ValueUtil.metaItemDescriptors.indexOf(descriptor);
+ if (index >= 0 && ValueUtil.metaItemDescriptors.get(index) != descriptor) {
throw new IllegalStateException("Duplicate meta item descriptor found: asset type=" + assetClass +", descriptor=" + metaItemDescriptors.get(index) + ", duplicate descriptor=" + descriptor);
}
metaItemDescriptors.add((MetaItemDescriptor<?>) descriptor);
- if (!Values.metaItemDescriptors.contains(descriptor)) {
- Values.metaItemDescriptors.add((MetaItemDescriptor<?>) descriptor);
+ if (!ValueUtil.metaItemDescriptors.contains(descriptor)) {
+ ValueUtil.metaItemDescriptors.add((MetaItemDescriptor<?>) descriptor);
}
} else if (descriptor instanceof ValueDescriptor) {
ValueDescriptor<?> valueDescriptor = (ValueDescriptor<?>)descriptor;
@@ -1035,8 +1032,8 @@ public class Values {
throw new IllegalStateException("Duplicate value descriptor found: asset type=" + assetClass +", descriptor=" + valueDescriptors.get(index) + ", duplicate descriptor=" + descriptor);
}
valueDescriptors.add(valueDescriptor);
- if (!Values.valueDescriptors.contains(descriptor)) {
- Values.valueDescriptors.add((ValueDescriptor<?>) descriptor);
+ if (!ValueUtil.valueDescriptors.contains(descriptor)) {
+ ValueUtil.valueDescriptors.add((ValueDescriptor<?>) descriptor);
}
}
});
diff --git a/model/src/main/java/org/openremote/model/validation/AssetValid.java b/model/src/main/java/org/openremote/model/validation/AssetValid.java
index 8eda1d349..0a8913e6d 100644
--- a/model/src/main/java/org/openremote/model/validation/AssetValid.java
+++ b/model/src/main/java/org/openremote/model/validation/AssetValid.java
@@ -23,8 +23,8 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.asset.AssetTypeInfo;
import org.openremote.model.util.TsIgnore;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.AttributeDescriptor;
-import org.openremote.model.value.Values;
import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
@@ -78,7 +78,7 @@ public @interface AssetValid {
public boolean isValid(Asset<?> value, ConstraintValidatorContext context) {
String type = value.getType();
- AssetTypeInfo assetModelInfo = Values.getAssetInfo(type).orElse(null);
+ AssetTypeInfo assetModelInfo = ValueUtil.getAssetInfo(type).orElse(null);
if (assetModelInfo == null || value.getClass() != assetModelInfo.getAssetDescriptor().getType()) {
context.buildConstraintViolationWithTemplate(ASSET_TYPE_INVALID).addConstraintViolation();
diff --git a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java
index 4848c667d..4afa4a283 100644
--- a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java
+++ b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.openremote.model.util.TextUtil;
+import org.openremote.model.util.ValueUtil;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
@@ -118,7 +119,7 @@ public abstract class AbstractNameValueHolder<T> implements NameValueHolder<T>,
AbstractNameValueHolder<?> that = (AbstractNameValueHolder<?>) o;
return name.equals(that.name)
&& Objects.equals(type, that.type)
- && Objects.equals(Values.convert(value, JsonNode.class), Values.convert(that.value, JsonNode.class));
+ && Objects.equals(ValueUtil.convert(value, JsonNode.class), ValueUtil.convert(that.value, JsonNode.class));
}
@Override
diff --git a/model/src/main/java/org/openremote/model/value/JsonPathFilter.java b/model/src/main/java/org/openremote/model/value/JsonPathFilter.java
index 946f8f028..8073e05eb 100644
--- a/model/src/main/java/org/openremote/model/value/JsonPathFilter.java
+++ b/model/src/main/java/org/openremote/model/value/JsonPathFilter.java
@@ -30,8 +30,7 @@ import com.jayway.jsonpath.ParseContext;
import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
import org.openremote.model.util.TextUtil;
-
-import java.util.Optional;
+import org.openremote.model.util.ValueUtil;
/**
* This filter works on any type of data; when applying the filter the data should be converted to JSON representation
@@ -74,7 +73,7 @@ public class JsonPathFilter extends ValueFilter {
return null;
}
- String valueStr = Values.convert(value, String.class);
+ String valueStr = ValueUtil.convert(value, String.class);
if (valueStr == null) {
return null;
@@ -82,8 +81,8 @@ public class JsonPathFilter extends ValueFilter {
Object obj = jsonPathParser.parse(valueStr).read(path);
- if ((returnFirst || returnLast) && obj != null && Values.isArray(obj.getClass())) {
- ArrayNode arrayNode = Values.convert(obj, ArrayNode.class);
+ if ((returnFirst || returnLast) && obj != null && ValueUtil.isArray(obj.getClass())) {
+ ArrayNode arrayNode = ValueUtil.convert(obj, ArrayNode.class);
obj = arrayNode.get(returnFirst ? 0 : arrayNode.size() - 1);
}
return obj;
diff --git a/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java b/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java
index d406a636c..281333480 100644
--- a/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java
+++ b/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;
import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.MetaItem;
+import org.openremote.model.util.ValueUtil;
/**
* Describes a {@link MetaItem} that can be added to an {@link Attribute}; the {@link #getName()} must match the {@link
@@ -53,7 +54,7 @@ public class MetaItemDescriptor<T> extends AbstractNameValueDescriptorHolder<T>
@Override
public MetaItemDescriptor<?> convert(String value) {
- return Values.getMetaItemDescriptor(value).orElse(MetaItemDescriptor.UNKNOWN);
+ return ValueUtil.getMetaItemDescriptor(value).orElse(MetaItemDescriptor.UNKNOWN);
}
}
diff --git a/model/src/main/java/org/openremote/model/value/RegexValueFilter.java b/model/src/main/java/org/openremote/model/value/RegexValueFilter.java
index 2aad79f87..a41d997a5 100644
--- a/model/src/main/java/org/openremote/model/value/RegexValueFilter.java
+++ b/model/src/main/java/org/openremote/model/value/RegexValueFilter.java
@@ -22,6 +22,7 @@ package org.openremote.model.value;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.openremote.model.util.ValueUtil;
import java.util.Optional;
import java.util.regex.Matcher;
@@ -73,7 +74,7 @@ public class RegexValueFilter extends ValueFilter {
return null;
}
- Optional<String> valueStr = Values.getValue(value, String.class, true);
+ Optional<String> valueStr = ValueUtil.getValue(value, String.class, true);
if (!valueStr.isPresent()) {
return null;
}
diff --git a/model/src/main/java/org/openremote/model/value/SubStringValueFilter.java b/model/src/main/java/org/openremote/model/value/SubStringValueFilter.java
index e29075534..8115da12c 100644
--- a/model/src/main/java/org/openremote/model/value/SubStringValueFilter.java
+++ b/model/src/main/java/org/openremote/model/value/SubStringValueFilter.java
@@ -22,6 +22,7 @@ package org.openremote.model.value;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.openremote.model.util.ValueUtil;
import java.util.Optional;
@@ -45,7 +46,7 @@ public class SubStringValueFilter extends ValueFilter {
@Override
public Object filter(Object value) {
- Optional<String> valueStr = Values.getValue(value, String.class, true);
+ Optional<String> valueStr = ValueUtil.getValue(value, String.class, true);
if (!valueStr.isPresent()) {
return null;
}
diff --git a/model/src/main/java/org/openremote/model/value/ValueConstraint.java b/model/src/main/java/org/openremote/model/value/ValueConstraint.java
index 4d856beba..1b2d4ab6f 100644
--- a/model/src/main/java/org/openremote/model/value/ValueConstraint.java
+++ b/model/src/main/java/org/openremote/model/value/ValueConstraint.java
@@ -20,16 +20,11 @@
package org.openremote.model.value;
import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.util.EnumValues;
+import org.openremote.model.util.ValueUtil;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.List;
import java.util.Optional;
-import java.util.function.Function;
/**
* Represents a constraint to apply to a value; these are based on JSR-380 validation.
@@ -161,7 +156,7 @@ public abstract class ValueConstraint implements Serializable {
}
public static AllowedValues fromEnum(Class<Enum<?>> enumClass) {
- Object[] allowedValues = Arrays.stream(enumClass.getEnumConstants()).map(enm -> Values.getStringCoerced(enm).orElse(null)).toArray(String[]::new);
+ Object[] allowedValues = Arrays.stream(enumClass.getEnumConstants()).map(enm -> ValueUtil.getStringCoerced(enm).orElse(null)).toArray(String[]::new);
return new AllowedValues(allowedValues);
}
}
diff --git a/model/src/main/java/org/openremote/model/value/ValueDescriptor.java b/model/src/main/java/org/openremote/model/value/ValueDescriptor.java
index a8f91d66a..27f688a40 100644
--- a/model/src/main/java/org/openremote/model/value/ValueDescriptor.java
+++ b/model/src/main/java/org/openremote/model/value/ValueDescriptor.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;
import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.MetaItem;
+import org.openremote.model.util.ValueUtil;
import java.io.Serializable;
import java.math.BigInteger;
@@ -65,7 +66,7 @@ public class ValueDescriptor<T> implements NameHolder, Serializable {
@Override
public ValueDescriptor<?> convert(String value) {
- return Values.getValueDescriptor(value).orElse(ValueDescriptor.UNKNOWN);
+ return ValueUtil.getValueDescriptor(value).orElse(ValueDescriptor.UNKNOWN);
}
}
@@ -198,19 +199,19 @@ public class ValueDescriptor<T> implements NameHolder, Serializable {
public String getJsonType() {
Class<?> type = getBaseType();
- if (Values.isBoolean(type)) {
+ if (ValueUtil.isBoolean(type)) {
return "boolean";
}
- if (Values.isNumber(type)) {
+ if (ValueUtil.isNumber(type)) {
if (BigInteger.class.isAssignableFrom(type)) {
return "bigint";
}
return "number";
}
- if (Values.isString(type) || type.isEnum()) {
+ if (ValueUtil.isString(type) || type.isEnum()) {
return "string";
}
- if (Values.isArray(type)) {
+ if (ValueUtil.isArray(type)) {
return "array";
}
if (Date.class.isAssignableFrom(type)) {
@@ -281,7 +282,7 @@ public class ValueDescriptor<T> implements NameHolder, Serializable {
@SuppressWarnings("unchecked")
public ValueDescriptor<T[]> asArray() {
try {
- Class<T[]> arrayClass = (Class<T[]>) Values.getArrayClass(type);
+ Class<T[]> arrayClass = (Class<T[]>) ValueUtil.getArrayClass(type);
return new ValueDescriptor<>(name + "[]", arrayClass, constraints, format, units, arrayDimensions == null ? 1 : arrayDimensions+1);
} catch (ClassNotFoundException ignored) {
// Can't happen as we have the source class already
diff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
index f3cf12676..75e7295ec 100644
--- a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
+++ b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
@@ -36,7 +36,7 @@ import org.openremote.model.geo.GeoJSONPoint;
import org.openremote.model.security.Tenant;
import org.openremote.model.value.ValueConstraint;
import org.openremote.model.value.ValueType;
-import org.openremote.model.value.Values;
+import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.impl.ColourRGB;
import static org.openremote.manager.datapoint.AssetDatapointService.DATA_POINTS_MAX_AGE_DAYS_DEFAULT;
@@ -424,7 +424,7 @@ public class ManagerTestSetup extends ManagerSetup {
apartment2Livingroom.setAccessPublicRead(true);
apartment2Livingroom.setParent(apartment2);
- ObjectNode objectMap = Values.createJsonObject();
+ ObjectNode objectMap = ValueUtil.createJsonObject();
objectMap.put("cactus", 0.8);
apartment2Livingroom.getAttributes().addOrReplace(
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
index f368b942f..c4d54adae 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
@@ -9,7 +9,7 @@ import org.openremote.manager.setup.SetupService
import org.openremote.test.setup.ManagerTestSetup
import org.openremote.model.attribute.AttributeRef
import org.openremote.model.datapoint.DatapointInterval
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -120,18 +120,18 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
// Note that the "No value" sensor update should not have created a datapoint, the first
// datapoint is the last sensor update with an actual value
- assert Values.getValue(datapoints.get(0).value, Double.class).orElse(null) == 15.5d
+ assert ValueUtil.getValue(datapoints.get(0).value, Double.class).orElse(null) == 15.5d
assert datapoints.get(0).timestamp == datapoint3ExpectedTimestamp
- assert Values.getValue(datapoints.get(1).value, Double.class).orElse(null) == 14.4d
+ assert ValueUtil.getValue(datapoints.get(1).value, Double.class).orElse(null) == 14.4d
assert datapoints.get(1).timestamp == datapoint2ExpectedTimestamp
- assert Values.getValue(datapoints.get(2).value, Double.class).orElse(null) == 13.5d
+ assert ValueUtil.getValue(datapoints.get(2).value, Double.class).orElse(null) == 13.5d
assert datapoints.get(2).timestamp == datapoint1ExpectedTimestamp
- assert Values.getValue(datapoints.get(3).value, Double.class).orElse(null) == 13.3d
+ assert ValueUtil.getValue(datapoints.get(3).value, Double.class).orElse(null) == 13.3d
- assert Values.getValue(datapoints.get(4).value, Double.class).orElse(null) == 13.3d
+ assert ValueUtil.getValue(datapoints.get(4).value, Double.class).orElse(null) == 13.3d
}
and: "the aggregated datapoints should match"
@@ -214,13 +214,13 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
def datapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, thingLightToggleAttributeName))
assert datapoints.size() == 3
- assert !Values.getBoolean(datapoints.get(0).value).orElse(null)
+ assert !ValueUtil.getBoolean(datapoints.get(0).value).orElse(null)
assert datapoints.get(0).timestamp == datapoint3ExpectedTimestamp
- assert Values.getBoolean(datapoints.get(1).value).orElse(null)
+ assert ValueUtil.getBoolean(datapoints.get(1).value).orElse(null)
assert datapoints.get(1).timestamp == datapoint2ExpectedTimestamp
- assert !Values.getBoolean(datapoints.get(2).value).orElse(null)
+ assert !ValueUtil.getBoolean(datapoints.get(2).value).orElse(null)
assert datapoints.get(2).timestamp == datapoint1ExpectedTimestamp
}
@@ -261,11 +261,11 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
def toggleDatapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, thingLightToggleAttributeName))
assert powerDatapoints.size() == 6
- assert Values.getValue(powerDatapoints.get(0).value, Double.class).orElse(null) == 17.5d
+ assert ValueUtil.getValue(powerDatapoints.get(0).value, Double.class).orElse(null) == 17.5d
assert powerDatapoints.get(0).timestamp == datapoint4ExpectedTimestamp
assert toggleDatapoints.size() == 4
- assert Values.getBoolean(toggleDatapoints.get(0).value).orElse(false)
+ assert ValueUtil.getBoolean(toggleDatapoints.get(0).value).orElse(false)
assert toggleDatapoints.get(0).timestamp == datapoint4ExpectedTimestamp
}
@@ -279,7 +279,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
conditions.eventually {
def datapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, "light1PowerConsumption"))
assert datapoints.size() == 1
- assert Values.getValue(datapoints.get(0).value, Double.class).orElse(null) == 17.5d
+ assert ValueUtil.getValue(datapoints.get(0).value, Double.class).orElse(null) == 17.5d
assert datapoints.get(0).timestamp == datapoint4ExpectedTimestamp
}
@@ -287,7 +287,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
conditions.eventually {
def datapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, thingLightToggleAttributeName))
assert datapoints.size() == 4
- assert Values.getBoolean(datapoints.get(0).value).orElse(false)
+ assert ValueUtil.getBoolean(datapoints.get(0).value).orElse(false)
assert datapoints.get(0).timestamp == datapoint4ExpectedTimestamp
}
@@ -307,7 +307,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
conditions.eventually {
def datapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, thingLightToggleAttributeName))
assert datapoints.size() == 4
- assert Values.getBoolean(datapoints.get(0).value).orElse(false)
+ assert ValueUtil.getBoolean(datapoints.get(0).value).orElse(false)
assert datapoints.get(0).timestamp == datapoint4ExpectedTimestamp
}
@@ -321,7 +321,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
conditions.eventually {
def datapoints = assetDatapointService.getDatapoints(new AttributeRef(managerTestSetup.thingId, thingLightToggleAttributeName))
assert datapoints.size() == 1
- assert Values.getBoolean(datapoints.get(0).value).orElse(false)
+ assert ValueUtil.getBoolean(datapoints.get(0).value).orElse(false)
assert datapoints.get(0).timestamp == datapoint4ExpectedTimestamp
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
index 688bf0383..ebde195ec 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
@@ -3,7 +3,7 @@ package org.openremote.test.assets
import org.openremote.manager.setup.SetupService
import org.openremote.model.attribute.AttributeState
import org.openremote.model.attribute.AttributeWriteFailure
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.test.setup.ManagerTestSetup
import org.openremote.model.asset.Asset
@@ -839,7 +839,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(AssetResource.class)
when: "the public assets are retrieved using the query parameter endpoint"
- def assets = assetResource.getPublicAssets(null, Values.asJSON(
+ def assets = assetResource.getPublicAssets(null, ValueUtil.asJSON(
new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))
).get())
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy
index 148caa5b6..45b3923fe 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy
@@ -12,7 +12,7 @@ import org.openremote.model.attribute.Attribute
import org.openremote.model.asset.AssetResource
import org.openremote.model.attribute.MetaItem
import org.openremote.model.query.AssetQuery
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -91,7 +91,7 @@ class AssetPublicQueryTest extends Specification implements ManagerContainerTrai
when: "a GET query for a specific public asset is executed"
def queryJson = "{\"select\":{\"include\":\"ALL\"},\"id\":\"${returnedAssets.get(0).id}\"}"
- queryJson = Values.JSON.writeValueAsString(query)
+ queryJson = ValueUtil.JSON.writeValueAsString(query)
assets = assetResource.getPublicAssets(null, queryJson)
then: "the result should match"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy
index b3088a378..c892b9f0c 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy
@@ -7,7 +7,7 @@ import org.openremote.model.asset.impl.ThingAsset
import org.openremote.model.attribute.*
import org.openremote.model.value.JsonPathFilter
import org.openremote.model.value.ValueFilter
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -60,13 +60,13 @@ class AttributeLinkingTest extends Specification implements ManagerContainerTrai
assert asset2.id != null
when: "attributes from one asset is linked to attributes on the other"
- def converterOnOff = Values.createJsonObject()
+ def converterOnOff = ValueUtil.createJsonObject()
converterOnOff.put("PRESSED", "@TOGGLE")
converterOnOff.put("RELEASED", "@IGNORE")
converterOnOff.put("LONG_PRESSED", "@IGNORE")
def attributeLinkOnOff = new AttributeLink(new AttributeRef(asset2.id, "lightOnOff"), converterOnOff, null)
- def converterCounter = Values.createJsonObject()
+ def converterCounter = ValueUtil.createJsonObject()
converterCounter.put("PRESSED", "@INCREMENT")
converterCounter.put("RELEASED", "@DECREMENT")
converterCounter.put("LONG_PRESSED", "@IGNORE")
@@ -165,10 +165,10 @@ class AttributeLinkingTest extends Specification implements ManagerContainerTrai
/* TODO Test has timing issues, fails in line 182 when run from CLI gradle clean build, works in IDE!
when: "the linked attribute is linked back to the source attribute (to create circular reference)"
- def converterLoop = Values.createObjectMap()
+ def converterLoop = ValueUtil.createObjectMap()
converterLoop.put("TRUE", "PRESSED")
converterLoop.put("FALSE", "PRESSED")
- def attributeLinkLoop = Values.createObjectMap()
+ def attributeLinkLoop = ValueUtil.createObjectMap()
attributeLinkLoop.put("ref", new AttributeRef(asset1.id, "button"))
attributeLinkLoop.put("converter", converterLoop)
asset2.getAttribute("lightOnOff").get().addMeta(new MetaItem<>(AssetMeta.ATTRIBUTE_LINK, attributeLinkLoop))
@@ -198,7 +198,7 @@ class AttributeLinkingTest extends Specification implements ManagerContainerTrai
*/
when: "the array attribute is written to"
- assetProcessingService.sendAttributeEvent(new AttributeEvent(asset1.id, "array", Values.parse("[{\"prop1\": true, \"prop2\": \"a\"},{\"prop1\": false, \"prop2\": \"b\"}]").orElse(null)))
+ assetProcessingService.sendAttributeEvent(new AttributeEvent(asset1.id, "array", ValueUtil.parse("[{\"prop1\": true, \"prop2\": \"a\"},{\"prop1\": false, \"prop2\": \"b\"}]").orElse(null)))
then: "the linked attribute on the other asset should contain the value from the json path"
conditions.eventually {
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index ddd10e28b..af1dc2459 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -32,7 +32,6 @@ import org.openremote.model.rules.RulesResource
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TenantRuleset
import org.openremote.model.value.MetaItemType
-import org.openremote.model.value.Values
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -48,7 +47,7 @@ import static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP
import static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrl
import static org.openremote.model.rules.RulesetStatus.DEPLOYED
import static org.openremote.model.util.TextUtil.isNullOrEmpty
-import static org.openremote.model.value.Values.parse
+import static org.openremote.model.util.ValueUtil.parse
class ConsoleTest extends Specification implements ManagerContainerTrait {
diff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
index 3018978e1..7eb0d4643 100644
--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
@@ -12,7 +12,7 @@ import org.openremote.model.asset.impl.*
import org.openremote.model.attribute.AttributeEvent
import org.openremote.model.attribute.AttributeRef
import org.openremote.model.datapoint.DatapointInterval
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.ManagerTestSetup
import spock.lang.Specification
@@ -279,7 +279,7 @@ class EnergyOptimisationAssetTest extends Specification implements ManagerContai
def optimisationAsset = assetStorageService.find(managerTestSetup.electricityOptimisationAssetId) as EnergyOptimisationAsset
optimisationAsset.setOptimisationDisabled(true)
optimisationAsset.setFinancialSaving(0d)
- optimisationAsset = Values.clone(assetStorageService.merge(optimisationAsset))
+ optimisationAsset = ValueUtil.clone(assetStorageService.merge(optimisationAsset))
optimisationAsset.setOptimisationDisabled(false)
optimisationAsset = assetStorageService.merge(optimisationAsset)
diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
index c626ed0fb..b007fbb9a 100644
--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
@@ -38,7 +38,7 @@ import org.openremote.model.gateway.GatewayConnection
import org.openremote.model.geo.GeoJSONPoint
import org.openremote.model.query.AssetQuery
import org.openremote.model.query.filter.TenantPredicate
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -147,7 +147,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
conditions.eventually {
assert clientReceivedMessages.size() >= 1
assert clientReceivedMessages[0].startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)
- def response = Values.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def response = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
assert response.messageId == GatewayConnector.ASSET_READ_EVENT_NAME_INITIAL
def readAssetsEvent = response.event as ReadAssetsEvent
assert readAssetsEvent.assetQuery != null
@@ -232,7 +232,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
def readAssetsReplyEvent = new EventRequestResponseWrapper(
GatewayConnector.ASSET_READ_EVENT_NAME_INITIAL,
new AssetsEvent(sendAssets))
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the central manager should have requested the full loading of the first batch of assets"
String messageId = null
@@ -241,7 +241,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert clientReceivedMessages.size() == 1
assert clientReceivedMessages.get(0).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)
assert clientReceivedMessages.get(0).contains("read-assets")
- def response = Values.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def response = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
messageId = response.messageId
readAssetsEvent = response.event as ReadAssetsEvent
assert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + "0"
@@ -262,7 +262,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
messageId,
new AssetsEvent(sendAssets)
)
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the central manager should have added the first batch of assets under the gateway asset"
conditions.eventually {
@@ -310,7 +310,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert clientReceivedMessages.size() == 2
assert clientReceivedMessages.get(1).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)
assert clientReceivedMessages.get(1).contains("read-assets")
- def response = Values.JSON.readValue(clientReceivedMessages[1].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def response = ValueUtil.JSON.readValue(clientReceivedMessages[1].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
messageId = response.messageId
readAssetsEvent = response.event as ReadAssetsEvent
assert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + GatewayConnector.SYNC_ASSET_BATCH_SIZE
@@ -328,7 +328,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
readAssetsReplyEvent = new EventRequestResponseWrapper(
messageId,
new AssetsEvent(sendAssets))
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the gateway asset status should become connected"
conditions.eventually {
@@ -365,7 +365,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
}
when: "the gateway handles the forwarded attribute event and sends a follow up attribute event to the local manager"
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AttributeEvent(assetIds[1], "tempSetpoint", 20d)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AttributeEvent(assetIds[1], "tempSetpoint", 20d)).get())
then: "the descendant asset in the local manager should contain the new attribute value"
conditions.eventually {
@@ -398,7 +398,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
)
)
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building1Room5Asset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building1Room5Asset, null)).get())
then: "the asset should be replicated in the local manager"
RoomAsset localBuilding1Room5Asset
@@ -422,7 +422,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
new MetaItem<>(AGENT_LINK, new HTTPAgentLink(agentAssetIds[0]).setPath(""))
)
)
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.UPDATE, building1Room5Asset, (String[]) ["name", "attributes"].toArray(new String[0]))).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.UPDATE, building1Room5Asset, (String[]) ["name", "attributes"].toArray(new String[0]))).get())
then: "the asset should also be updated in the local manager"
conditions.eventually {
@@ -438,7 +438,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
}
when: "an asset is deleted on the gateway and the local manager is notified"
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, building1Room5Asset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, building1Room5Asset, null)).get())
then: "the asset should also be deleted in the local manager"
conditions.eventually {
@@ -453,9 +453,9 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
def responseFuture = new AtomicReference<ScheduledFuture>()
responseFuture.set(executorService.scheduleAtFixedRate({
if (!clientReceivedMessages.isEmpty()) {
- def assetAddEvent = Values.JSON.readValue(clientReceivedMessages[0].substring(SharedEvent.MESSAGE_PREFIX.length()), AssetEvent.class)
+ def assetAddEvent = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(SharedEvent.MESSAGE_PREFIX.length()), AssetEvent.class)
if (assetAddEvent.cause == AssetEvent.Cause.CREATE && assetAddEvent.asset.id == building1Room5AssetId) {
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building1Room5Asset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building1Room5Asset, null)).get())
responseFuture.get().cancel(false)
}
}
@@ -475,11 +475,11 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
localBuilding1Room5Asset.getAttributes().remove("co2Level")
responseFuture.set(executorService.scheduleAtFixedRate({
if (!clientReceivedMessages.isEmpty()) {
- def assetAddEvent = Values.JSON.readValue(clientReceivedMessages[0].substring(SharedEvent.MESSAGE_PREFIX.length()), AssetEvent.class)
+ def assetAddEvent = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(SharedEvent.MESSAGE_PREFIX.length()), AssetEvent.class)
if (assetAddEvent.cause == AssetEvent.Cause.UPDATE && assetAddEvent.asset.id == building1Room5AssetId) {
building1Room5Asset.setName(localBuilding1Room5Asset.name)
building1Room5Asset.getAttributes().remove("co2Level")
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.UPDATE, building1Room5Asset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.UPDATE, building1Room5Asset, null)).get())
responseFuture.get().cancel(false)
}
}
@@ -504,11 +504,11 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
and: "an asset is deleted under the gateway in the local manager and the gateway responds that it successfully deleted the asset"
responseFuture.set(executorService.scheduleAtFixedRate({
if (!clientReceivedMessages.isEmpty()) {
- def request = Values.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def request = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
def deleteRequest = request.event as DeleteAssetsRequestEvent
if (deleteRequest.assetIds.size() == 1 && deleteRequest.assetIds.get(0) == building1Room5AssetId) {
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(new EventRequestResponseWrapper(request.messageId, new DeleteAssetsResponseEvent(true, deleteRequest.assetIds))).get())
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, building1Room5Asset, null)).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(new EventRequestResponseWrapper(request.messageId, new DeleteAssetsResponseEvent(true, deleteRequest.assetIds))).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, building1Room5Asset, null)).get())
responseFuture.get().cancel(false)
}
}
@@ -616,14 +616,14 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
GatewayConnector.ASSET_READ_EVENT_NAME_INITIAL,
new AssetsEvent(sendAssets)
)
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the central manager should have requested the full loading of the first batch of assets"
conditions.eventually {
assert clientReceivedMessages.size() == 1
assert clientReceivedMessages.get(0).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)
assert clientReceivedMessages.get(0).contains("read-assets")
- def request = Values.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def request = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
messageId = request.messageId
readAssetsEvent = request.event as ReadAssetsEvent
assert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + "0"
@@ -660,25 +660,25 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
)
)
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building2Room5Asset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.CREATE, building2Room5Asset, null)).get())
and: "another asset is deleted from the gateway during the initial sync process (Building 3 Room 1)"
def removedAsset = assets.remove(10)
- gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + Values.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, removedAsset, null)).get())
+ gatewayClient.sendMessage(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(new AssetEvent(AssetEvent.Cause.DELETE, removedAsset, null)).get())
and: "the gateway returns the requested assets (minus the deleted Building 3 Room 1 asset)"
sendAssets = [building1Room5Asset]
sendAssets.addAll(agentAssets)
sendAssets.addAll(Arrays.stream(readAssetsEvent.assetQuery.ids).filter{!agentAssetIds.contains(it) && it != removedAsset.id && it != building1Room5Asset.id}.map{id -> assets.stream().filter{it.id == id}.findFirst().orElse(null)}.collect(Collectors.toList()))
readAssetsReplyEvent = new EventRequestResponseWrapper(messageId, new AssetsEvent(sendAssets))
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the central manager should have requested the full loading of the second batch of assets"
conditions.eventually {
assert clientReceivedMessages.size() == 2
assert clientReceivedMessages.get(1).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)
assert clientReceivedMessages.get(1).contains("read-assets")
- def request = Values.JSON.readValue(clientReceivedMessages[1].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
+ def request = ValueUtil.JSON.readValue(clientReceivedMessages[1].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)
messageId = request.messageId
readAssetsEvent = request.event as ReadAssetsEvent
assert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + (GatewayConnector.SYNC_ASSET_BATCH_SIZE - 1)
@@ -694,7 +694,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
sendAssets = []
sendAssets.addAll(Arrays.stream(readAssetsEvent.assetQuery.ids).map{id -> assets.stream().filter{asset -> asset.id == id}.findFirst().orElse(null)}.collect(Collectors.toList()))
readAssetsReplyEvent = new EventRequestResponseWrapper(messageId, new AssetsEvent(sendAssets))
- gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + Values.asJSON(readAssetsReplyEvent).get())
+ gatewayClient.sendMessage(EventRequestResponseWrapper.MESSAGE_PREFIX + ValueUtil.asJSON(readAssetsReplyEvent).get())
then: "the gateway asset status should become connected"
conditions.eventually {
@@ -840,7 +840,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
}
when: "an asset is added under the gateway asset"
- def microphone3 = Values.clone(microphone1)
+ def microphone3 = ValueUtil.clone(microphone1)
.setName("Microphone 3")
.setId(null)
.setRealm(managerTestSetup.realmBuildingTenant)
diff --git a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
index 285a098e7..086dc0dcb 100644
--- a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
@@ -2,7 +2,7 @@ package org.openremote.test.map
import groovy.json.JsonSlurper
import org.openremote.model.map.MapResource
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Ignore
import spock.lang.Specification
@@ -42,7 +42,7 @@ class MapResourceTest extends Specification implements ManagerContainerTrait {
mapSettings != null
and: "JSON content is valid"
- def json = new JsonSlurper().parseText(Values.asJSON(mapSettings).orElse("null"))
+ def json = new JsonSlurper().parseText(ValueUtil.asJSON(mapSettings).orElse("null"))
json.options != null
json.options.default != null
json.options.default.center.size() == 2
diff --git a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
index 851f9af28..1cc41993e 100644
--- a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
@@ -3,12 +3,10 @@ package org.openremote.test.model
import com.fasterxml.jackson.databind.node.ObjectNode
import org.openremote.agent.protocol.http.HTTPAgentLink
import org.openremote.agent.protocol.simulator.SimulatorAgent
-import org.openremote.agent.protocol.simulator.SimulatorAgentLink
import org.openremote.agent.protocol.velbus.VelbusTCPAgent
import org.openremote.manager.asset.AssetModelService
import org.openremote.model.asset.Asset
import org.openremote.model.asset.AssetModelResource
-import org.openremote.model.asset.agent.Agent
import org.openremote.model.asset.agent.AgentDescriptor
import org.openremote.model.asset.agent.AgentLink
import org.openremote.model.asset.agent.DefaultAgentLink
@@ -24,7 +22,7 @@ import org.openremote.model.value.SubStringValueFilter
import org.openremote.model.value.ValueConstraint
import org.openremote.model.value.ValueFilter
import org.openremote.model.value.ValueType
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.model.value.impl.ColourRGB
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.protocol.http.HTTPServerTestAgent
@@ -49,14 +47,14 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
def "Retrieving all asset model info"() {
when: "an asset info is serialised"
- def thingAssetInfo = Values.getAssetInfo(ThingAsset.class).orElse(null)
- def thingAssetInfoStr = Values.asJSON(thingAssetInfo)
+ def thingAssetInfo = ValueUtil.getAssetInfo(ThingAsset.class).orElse(null)
+ def thingAssetInfoStr = ValueUtil.asJSON(thingAssetInfo)
then: "it should contain the right information"
thingAssetInfoStr.isPresent()
when: "the JSON representation is deserialised"
- def thingAssetInfo2 = Values.parse(thingAssetInfoStr.get(), AssetTypeInfo.class)
+ def thingAssetInfo2 = ValueUtil.parse(thingAssetInfoStr.get(), AssetTypeInfo.class)
then: "it should have been successfully deserialised"
thingAssetInfo2.isPresent()
@@ -66,13 +64,13 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
thingAssetInfo2.get().attributeDescriptors.find { (it == Asset.LOCATION) }.type == ValueType.GEO_JSON_POINT
when: "the asset type value descriptor is retrieved"
- def assetValueType = Values.getValueDescriptor(ValueType.ASSET_TYPE.getName())
+ def assetValueType = ValueUtil.getValueDescriptor(ValueType.ASSET_TYPE.getName())
then: "it should contain an allowed values constraint with all asset types listed"
assetValueType.isPresent()
assetValueType.get().constraints != null
assetValueType.get().constraints.find {it instanceof ValueConstraint.AllowedValues} as ValueConstraint.AllowedValues != null
- (assetValueType.get().constraints.find {it instanceof ValueConstraint.AllowedValues} as ValueConstraint.AllowedValues).allowedValues.length == Values.getAssetInfos().length
+ (assetValueType.get().constraints.find {it instanceof ValueConstraint.AllowedValues} as ValueConstraint.AllowedValues).allowedValues.length == ValueUtil.getAssetInfos().length
(assetValueType.get().constraints.find {it instanceof ValueConstraint.AllowedValues} as ValueConstraint.AllowedValues).allowedValues.any { (it == GroupAsset.class.getSimpleName()) }
when: "All asset model infos are retrieved"
@@ -80,7 +78,7 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
then: "the asset model infos should be available"
assetInfos.size() > 0
- assetInfos.size() == Values.assetTypeMap.size()
+ assetInfos.size() == ValueUtil.assetTypeMap.size()
def velbusTcpAgent = assetInfos.find {it.assetDescriptor.type == VelbusTCPAgent.class}
velbusTcpAgent != null
velbusTcpAgent.attributeDescriptors.any {it == VelbusTCPAgent.VELBUS_HOST && !it.optional}
@@ -99,20 +97,20 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
thingAssetInfo.valueDescriptors != null
thingAssetInfo.attributeDescriptors.contains(Asset.LOCATION)
thingAssetInfo.metaItemDescriptors.contains(MetaItemType.AGENT_LINK)
- Values.getAssetDescriptor(ThingAsset.class) != null
- Values.getAgentDescriptor(SimulatorAgent.class) != null
+ ValueUtil.getAssetDescriptor(ThingAsset.class) != null
+ ValueUtil.getAgentDescriptor(SimulatorAgent.class) != null
when: "the http test server agent descriptor is retrieved (the test asset model provider should have registered test agents and assets)"
- def testAgentDescriptor = Values.getAgentDescriptor(HTTPServerTestAgent.DESCRIPTOR.name).orElse(null)
+ def testAgentDescriptor = ValueUtil.getAgentDescriptor(HTTPServerTestAgent.DESCRIPTOR.name).orElse(null)
then: "the descriptor should have been found"
assert testAgentDescriptor != null
and: "the descriptor should contain an agent link schema"
- def schema = Values.getSchema(AgentLink.class)
+ def schema = ValueUtil.getSchema(AgentLink.class)
assert schema != null
assert schema.get("anyOf") != null
- assert schema.get("anyOf").size() == Values.getAssetDescriptors(null).findAll {it instanceof AgentDescriptor}.collect {(it as AgentDescriptor).getAgentLinkClass()}.unique {it.getSimpleName()}.size()
+ assert schema.get("anyOf").size() == ValueUtil.getAssetDescriptors(null).findAll {it instanceof AgentDescriptor}.collect {(it as AgentDescriptor).getAgentLinkClass()}.unique {it.getSimpleName()}.size()
}
def "Serialize/Deserialize asset model"() {
@@ -147,10 +145,10 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
asset.getColourRGB().map{it.getB()}.orElse(null) == 200I
when: "the asset is serialised using default object mapper"
- def assetStr = Values.asJSON(asset).orElse(null)
+ def assetStr = ValueUtil.asJSON(asset).orElse(null)
then: "the string should be valid JSON"
- def assetObjectNode = Values.parse(assetStr, ObjectNode.class).get()
+ def assetObjectNode = ValueUtil.parse(assetStr, ObjectNode.class).get()
assetObjectNode.get("name").asText() == "Test light"
assetObjectNode.get("attributes").get("colourRGB").get("timestamp") == null
assetObjectNode.get("attributes").get("colourRGB").get("meta").get(MetaItemType.AGENT_LINK.name).isObject()
@@ -162,7 +160,7 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
assetObjectNode.get("attributes").get("testAttribute").get("meta").get(MetaItemType.AGENT_LINK.name).get("type").asText() == HTTPAgentLink.class.getSimpleName()
when: "the asset is deserialized"
- def asset2 = Values.parse(assetStr, LightAsset.class).orElse(null)
+ def asset2 = ValueUtil.parse(assetStr, LightAsset.class).orElse(null)
then: "it should match the original"
asset.getName() == asset2.getName()
@@ -177,7 +175,7 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
when: "an attribute is cloned"
def attribute = asset2.getAttribute(LightAsset.COLOUR_RGB).get()
- def clonedAttribute = Values.clone(attribute)
+ def clonedAttribute = ValueUtil.clone(attribute)
then: "the cloned attribute should match the source"
clonedAttribute.getName() == attribute.getName()
@@ -186,10 +184,10 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
when: "an asset state is serialized"
def assetState = new AssetState(asset2, attribute, null)
- def assetStateStr = Values.asJSON(assetState).orElse(null)
+ def assetStateStr = ValueUtil.asJSON(assetState).orElse(null)
then: "it should look as expected"
- def assetStateObjectNode = Values.parse(assetStateStr, ObjectNode.class).get()
+ def assetStateObjectNode = ValueUtil.parse(assetStateStr, ObjectNode.class).get()
assetStateObjectNode.get("name").asText() == LightAsset.COLOUR_RGB.name
assetStateObjectNode.get("value").isTextual()
assetStateObjectNode.get("value").asText() == "#3264c8"
diff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
index f854e8cb0..7c8a3cd9b 100644
--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
@@ -13,7 +13,7 @@ import org.openremote.model.asset.AssetEvent
import org.openremote.model.asset.impl.ThingAsset
import org.openremote.model.attribute.Attribute
import org.openremote.model.attribute.AttributeEvent
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.RawClient
import org.openremote.test.setup.KeycloakTestSetup
@@ -227,7 +227,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
when: "a mqtt client publishes to an asset attribute which is readonly"
topic = "attribute/" + managerTestSetup.apartment1HallwayId
- def payload = Values.asJSON(Values.createJsonObject().put("motionSensor", 70)).orElse(null)
+ def payload = ValueUtil.asJSON(ValueUtil.createJsonObject().put("motionSensor", 70)).orElse(null)
remainingLength = 2 + topic.size() + payload.length()
//PUBLISH
@@ -246,7 +246,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
when: "a mqtt client publishes to an asset attribute"
topic = "attributevalue/" + managerTestSetup.apartment1HallwayId + "/lights"
- payload = Values.asJSON(false).orElse(null)
+ payload = ValueUtil.asJSON(false).orElse(null)
remainingLength = 2 + topic.size() + payload.length()
//PUBLISH
diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
index 84f3562de..4874ab1bd 100644
--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
@@ -13,8 +13,6 @@ import org.openremote.manager.notification.PushNotificationHandler
import org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapter
import org.openremote.manager.security.ManagerIdentityService
import org.openremote.manager.setup.SetupService
-import org.openremote.model.query.UserQuery
-import org.openremote.model.query.filter.TenantPredicate
import org.openremote.model.util.TextUtil
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.test.setup.ManagerTestSetup
@@ -38,7 +36,7 @@ import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMI
import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.notification.PushNotificationAction.writeAttributeValueAction
-import static org.openremote.model.value.Values.parse
+import static org.openremote.model.util.ValueUtil.parse
class NotificationTest extends Specification implements ManagerContainerTrait {
diff --git a/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy
index a48243633..c47c206e7 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy
@@ -35,7 +35,7 @@ import org.openremote.model.attribute.AttributeEvent
import org.openremote.model.attribute.AttributeRef
import org.openremote.model.attribute.MetaItem
import com.fasterxml.jackson.databind.node.ObjectNode
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Ignore
import spock.lang.Specification
@@ -145,7 +145,7 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr
def queryParams = uriInfo.getQueryParameters(true)
if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_command") {
String bodyStr = (String)requestContext.getEntity()
- ObjectNode body = Values.parse(bodyStr).orElse(null)
+ ObjectNode body = ValueUtil.parse(bodyStr).orElse(null)
if (body != null && body.get("parameter").isPresent() && body.get("parameter").orElse(null).toString() == "a_parameter") {
requestContext.abortWith(Response.ok().build())
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy
index ae69b4330..dde581052 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy
@@ -41,7 +41,7 @@ import org.openremote.model.auth.OAuthPasswordGrant
import org.openremote.model.auth.OAuthRefreshTokenGrant
import org.openremote.model.value.RegexValueFilter
import org.openremote.model.value.ValueFilter
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -166,7 +166,7 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTr
&& requestContext.getHeaderString("Content-type") == MediaType.APPLICATION_JSON) {
String bodyStr = (String)requestContext.getEntity()
- ObjectNode body = Values.parse(bodyStr).orElse(null)
+ ObjectNode body = ValueUtil.parse(bodyStr).orElse(null)
if (body.has("prop1")
&& body.get("prop1").get("myProp1").asInt() == 123
&& body.get("prop1").get("myProp2").asBoolean()
@@ -265,10 +265,10 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTr
)
.setFollowRedirects(true)
.setRequestHeaders(
- Values.parse(/{"header1": ["header1Value1"], "header2": ["header2Value1","header2Value2"]}/, MultivaluedStringMap.class).orElseThrow()
+ ValueUtil.parse(/{"header1": ["header1Value1"], "header2": ["header2Value1","header2Value2"]}/, MultivaluedStringMap.class).orElseThrow()
)
.setRequestQueryParameters(
- Values.parse(/{"param1": ["param1Value1"], "param2": ["param2Value1","param2Value2"]}/, MultivaluedStringMap.class).orElseThrow()
+ ValueUtil.parse(/{"param1": ["param1Value1"], "param2": ["param2Value1","param2Value2"]}/, MultivaluedStringMap.class).orElseThrow()
)
and: "the agent is added to the asset service"
@@ -310,7 +310,7 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTr
.addMeta(
new MetaItem<>(AGENT_LINK, new HTTPAgentLink(agent.id)
.setPath('value/{$value}/set')
- .setWriteValueConverter((ObjectNode)Values.parse("{\n" +
+ .setWriteValueConverter((ObjectNode)ValueUtil.parse("{\n" +
" \"TRUE\": \"on\",\n" +
" \"FALSE\": \"off\"\n" +
"}").get())
@@ -369,7 +369,7 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTr
when: "a linked attribute value is updated"
def attributeEvent = new AttributeEvent(asset.id,
"putRequestWithHeaders",
- Values.parse('{"myProp1": 123,"myProp2": true}').get())
+ ValueUtil.parse('{"myProp1": 123,"myProp2": true}').get())
assetProcessingService.sendAttributeEvent(attributeEvent)
then: "the server should have received the request"
@@ -405,9 +405,9 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTr
.setFollowRedirects(null)
.setRequestHeaders(null)
.setRequestQueryParameters(null)
- def agent3 = Values.clone(agent2)
+ def agent3 = ValueUtil.clone(agent2)
.setId(null)
- def agent4 = Values.clone(agent2)
+ def agent4 = ValueUtil.clone(agent2)
.setId(null)
.setFollowRedirects(true)
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
index 5243064f2..d761f90fb 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
@@ -37,7 +37,7 @@ import org.openremote.model.auth.OAuthGrant
import org.openremote.model.auth.OAuthPasswordGrant
import org.openremote.model.auth.OAuthRefreshTokenGrant
import org.openremote.model.geo.GeoJSONPoint
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -181,7 +181,7 @@ class HttpServerProtocolTest extends Specification implements ManagerContainerTr
|| requestContext.getHeaderString("Content-type") == MediaType.APPLICATION_XML)) {
String bodyStr = (String)requestContext.getEntity()
- ObjectNode body = Values.parse(bodyStr).orElse(null)
+ ObjectNode body = ValueUtil.parse(bodyStr).orElse(null)
if (body.get("prop1").isPresent() && body.get("prop2").isPresent()) {
pingCount++
requestContext.abortWith(Response.ok().build())
@@ -206,7 +206,7 @@ class HttpServerProtocolTest extends Specification implements ManagerContainerTr
&& requestContext.getHeaderString("Content-type") == MediaType.APPLICATION_JSON) {
String bodyStr = (String)requestContext.getEntity()
- ObjectNode body = Values.parse(bodyStr).orElse(null)
+ ObjectNode body = ValueUtil.parse(bodyStr).orElse(null)
if (body.get("prop1").isPresent()
&& body.get("prop1").get().toString() == /{"myProp1":123,"myProp2":true}/
&& body.get("prop2").isPresent() && body.get("prop2").get().toString() == "prop2Value") {
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
index aa0e4f5fa..fceb797e6 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
@@ -30,7 +30,7 @@ import org.openremote.model.auth.OAuthRefreshTokenGrant
import org.openremote.container.web.OAuthServerResponse
import org.openremote.container.web.QueryParameterInjectorFilter
import org.openremote.container.web.WebTargetBuilder
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import spock.lang.Shared
import spock.lang.Specification
@@ -240,10 +240,10 @@ class WebTargetTest extends Specification {
"password")
when: "it is serialised"
- String grantStr = Values.asJSON(grant).orElse(null)
+ String grantStr = ValueUtil.asJSON(grant).orElse(null)
and: "deserialised again"
- OAuthGrant grant2 = Values.JSON.readValue(grantStr, OAuthGrant.class)
+ OAuthGrant grant2 = ValueUtil.JSON.readValue(grantStr, OAuthGrant.class)
then: "the two grant objects should be the same"
assert grant2.tokenEndpointUri == grant.tokenEndpointUri
diff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
index 8eac55758..aeb641689 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
@@ -11,7 +11,7 @@ import org.openremote.model.attribute.Attribute
import org.openremote.model.attribute.MetaItem
import org.openremote.model.file.FileInfo
import org.openremote.model.util.TextUtil
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -163,7 +163,7 @@ class VelbusProtocolTest extends Specification implements ManagerContainerTrait
!it.asset.getAttributes().isEmpty() &&
it.asset.getAttributes().values().every {attr ->
attr.getMetaValue(AGENT_LINK).map{
- Values.getValue(it, VelbusAgentLink.class)
+ ValueUtil.getValue(it, VelbusAgentLink.class)
.map({agentLink -> agentLink.id == agent.id && agentLink.deviceAddress.isPresent() && agentLink.deviceValueLink.isPresent()})
.orElse(false)
}.orElse(true)
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.groovy
index facd0871d..bbfa48f03 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
@@ -51,7 +51,7 @@ import org.openremote.model.value.JsonPathFilter
import org.openremote.model.value.RegexValueFilter
import org.openremote.model.value.SubStringValueFilter
import org.openremote.model.value.ValueFilter
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -102,7 +102,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
&& requestContext.getHeaderString("Content-type") == MediaType.APPLICATION_JSON) {
String bodyStr = (String)requestContext.getEntity()
- AssetQuery assetQuery = Values.JSON.readValue(bodyStr, AssetQuery.class)
+ AssetQuery assetQuery = ValueUtil.JSON.readValue(bodyStr, AssetQuery.class)
if (assetQuery != null && assetQuery.ids != null && assetQuery.ids.size() == 1) {
agentSubscriptionDone = true
requestContext.abortWith(Response.ok().build())
@@ -152,7 +152,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
MASTER_REALM_ADMIN_USER,
getString(container.getConfig(), SETUP_ADMIN_PASSWORD, SETUP_ADMIN_PASSWORD_DEFAULT)))
.setConnectSubscriptions([
- new WebsocketSubscription().body(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX + Values.asJSON(
+ new WebsocketSubscription().body(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX + ValueUtil.asJSON(
new EventSubscription(
AttributeEvent.class,
new AssetFilter<AttributeEvent>().setAssetIds(managerTestSetup.apartment1LivingroomId),
@@ -167,7 +167,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
]))
.uri("https://mockapi/assets")
.body(
- Values.asJSON(new AssetQuery().ids(managerTestSetup.apartment1LivingroomId)).orElse(null)
+ ValueUtil.asJSON(new AssetQuery().ids(managerTestSetup.apartment1LivingroomId)).orElse(null)
)
] as WebsocketSubscription[]
)
@@ -195,11 +195,11 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
.addMeta(
new MetaItem<>(AGENT_LINK, new WebsocketAgentLink(agent.id)
.setWriteValue(SharedEvent.MESSAGE_PREFIX +
- Values.asJSON(new AttributeEvent(
+ ValueUtil.asJSON(new AttributeEvent(
managerTestSetup.apartment1LivingroomId,
"targetTemperature",
0.12345))
- .orElse(Values.NULL_LITERAL)
+ .orElse(ValueUtil.NULL_LITERAL)
.replace("0.12345", Protocol.DYNAMIC_VALUE_PLACEHOLDER)
)
.setMessageMatchFilters(
@@ -219,7 +219,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
)
.setWebsocketSubscriptions(
[
- new WebsocketSubscription().body(SharedEvent.MESSAGE_PREFIX + Values.asJSON(
+ new WebsocketSubscription().body(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(
new ReadAttributeEvent(managerTestSetup.apartment1LivingroomId, "targetTemperature")
).orElse(null)),
new WebsocketHTTPSubscription()
@@ -249,7 +249,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai
)
.setWebsocketSubscriptions(
[
- new WebsocketSubscription().body(SharedEvent.MESSAGE_PREFIX + Values.asJSON(
+ new WebsocketSubscription().body(SharedEvent.MESSAGE_PREFIX + ValueUtil.asJSON(
new ReadAttributeEvent(managerTestSetup.apartment1LivingroomId, "co2Level")
).orElse(null)),
new WebsocketHTTPSubscription()
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 cff29a447..4b485187f 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
@@ -34,7 +34,7 @@ import org.openremote.model.attribute.AttributeEvent
import org.openremote.model.auth.OAuthPasswordGrant
import org.openremote.model.event.TriggeredEventSubscription
import org.openremote.model.event.shared.EventSubscription
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -56,7 +56,7 @@ class WebsocketClientTest extends Specification implements ManagerContainerTrait
protected static <T> T messageFromString(String message, String prefix, Class<T> clazz) {
try {
message = message.substring(prefix.length())
- return Values.JSON.readValue(message, clazz)
+ return ValueUtil.JSON.readValue(message, clazz)
} catch (Exception e) {
throw new IllegalArgumentException("Unable to parse message")
}
@@ -64,7 +64,7 @@ class WebsocketClientTest extends Specification implements ManagerContainerTrait
protected static String messageToString(String prefix, Object message) {
try {
- String str = Values.asJSON(message).orElse(null)
+ String str = ValueUtil.asJSON(message).orElse(null)
return prefix + str;
} catch (Exception e) {
throw new IllegalArgumentException("Unable to serialise message");
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
index 36288d97d..838a0fad2 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
@@ -12,7 +12,7 @@ import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TemporaryFact
import org.openremote.model.rules.flow.NodeCollection
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -53,7 +53,7 @@ class FlowRulesTest extends Specification implements ManagerContainerTrait {
String json = getClass().getResource("/org/openremote/test/rules/BasicFlowRules.json").text
json = json.replaceAll("%LIVING ROOM ID%", managerTestSetup.apartment1LivingroomId)
json = json.replaceAll("%BEDROOM ID%", managerTestSetup.apartment1Bedroom1Id)
- NodeCollection realCollection = Values.JSON.readValue(json, NodeCollection.class)
+ NodeCollection realCollection = ValueUtil.JSON.readValue(json, NodeCollection.class)
def ruleset = (new GlobalRuleset(
realCollection.name,
Ruleset.Lang.FLOW,
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
index e80c3361f..b5c37ad3d 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
@@ -34,7 +34,7 @@ import org.openremote.model.rules.RulesetStatus
import org.openremote.model.rules.TemporaryFact
import org.openremote.model.rules.TenantRuleset
import org.openremote.model.rules.json.JsonRulesetDefinition
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.simplejavamail.email.Email
import spock.lang.Specification
@@ -47,7 +47,7 @@ import static java.util.concurrent.TimeUnit.HOURS
import static java.util.concurrent.TimeUnit.MILLISECONDS
import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_SMART_BUILDING
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
-import static org.openremote.model.value.Values.parse
+import static org.openremote.model.util.ValueUtil.parse
class JsonRulesTest extends Specification implements ManagerContainerTrait {
@@ -240,7 +240,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
assert emailMessages.size() == 1
assert emailMessages[0].recipients.size() == 1
assert emailMessages[0].recipients[0].address == "[email protected]"
- assert emailMessages[0].HTMLText == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + Values.asJSON(outsideLocation).orElse("") + "</td></tr></table>"
+ assert emailMessages[0].HTMLText == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + ValueUtil.asJSON(outsideLocation).orElse("") + "</td></tr></table>"
}
and: "after a few seconds the rule should not have fired again"
@@ -278,9 +278,9 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
when: "the ruleset is modified to add a 4hr recurrence per asset"
def version = ruleset.version
- JsonRulesetDefinition jsonRules = Values.JSON.readValue(ruleset.rules, JsonRulesetDefinition.class)
+ JsonRulesetDefinition jsonRules = ValueUtil.JSON.readValue(ruleset.rules, JsonRulesetDefinition.class)
jsonRules.rules[0].recurrence.mins = 240
- ruleset.rules = Values.asJSON(jsonRules).orElse(null)
+ ruleset.rules = ValueUtil.asJSON(jsonRules).orElse(null)
ruleset = rulesetStorageService.merge(ruleset)
then: "the ruleset to be redeployed"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
index 22fbdad93..cccefbd57 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
@@ -27,7 +27,7 @@ import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TemporaryFact
import com.fasterxml.jackson.databind.node.ObjectNode
-import org.openremote.model.value.Values
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -38,7 +38,7 @@ import static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTM
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
import static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP_METHOD
import static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrl
-import static org.openremote.model.value.Values.parse
+import static org.openremote.model.util.ValueUtil.parse
class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerContainerTrait {
@@ -190,7 +190,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCo
assert pushMessage.buttons[1].title == "Alarm uit"
assert pushMessage.buttons[1].action.url == getWriteAttributeUrl(new AttributeRef(managerTestSetup.apartment1Id, "alarmEnabled"))
assert pushMessage.buttons[1].action.httpMethod == WRITE_ATTRIBUTE_HTTP_METHOD
- assert !Values.getBoolean(pushMessage.buttons[1].action.data).orElse(true)
+ assert !ValueUtil.getBoolean(pushMessage.buttons[1].action.data).orElse(true)
assert !pushMessage.buttons[1].action.openInBrowser
assert pushMessage.buttons[1].action.silent
}