Skip to content

armgit / core

Public Imported from GitHub
0

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

Model descriptor updates

Rich Turner045a21642b7a
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
index 288d66479..958d93bca 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
@@ -129,7 +129,7 @@ public abstract class AbstractProtocol implements Protocol {
null,
1,
null,
- false)
+ false, null, null, null)
);
}
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 c550d0a2a..8277663f6 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
@@ -146,25 +146,25 @@ public class ControllerProtocol extends AbstractProtocol {
protected static final List<MetaItemDescriptorImpl> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays
.asList(new MetaItemDescriptorImpl(META_PROTOCOL_BASE_URI, ValueType.STRING, true,
- REGEXP_PATTERN_BASIC_HTTP_URL, MetaItemDescriptor.PatternFailure.HTTP_URL.name(), 1, null, false),
+ REGEXP_PATTERN_BASIC_HTTP_URL, MetaItemDescriptor.PatternFailure.HTTP_URL.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_PROTOCOL_USERNAME, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY_NO_WHITESPACE,
- MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(), 1, null, false),
+ MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_PROTOCOL_PASSWORD, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY_NO_WHITESPACE,
- MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(), 1, null, false));
+ MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(), 1, null, false, null, null, null));
public static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays
.asList(new MetaItemDescriptorImpl(META_ATTRIBUTE_DEVICE_NAME, ValueType.STRING, false,
- REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
+ REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_ATTRIBUTE_SENSOR_NAME, ValueType.STRING, false,
- REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
+ REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMAND_DEVICE_NAME, ValueType.STRING, false,
- REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
+ REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMAND_NAME, ValueType.STRING, false,
- REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
+ REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false, null, null, null),
new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMANDS_MAP, ValueType.OBJECT, false, null, null, 1, null,
- false));
+ false, null, null, null));
/*--------------- Protocol attributes ---------------*/
public static final String PROTOCOL_DISPLAY_NAME = "Controller Client";
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
index f6741c156..92da9d2d1 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
@@ -449,7 +449,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.HTTP_URL.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_USERNAME,
ValueType.STRING,
@@ -458,7 +458,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PASSWORD,
ValueType.STRING,
@@ -467,7 +467,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY_OR_CONTAINS_WHITESPACE.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_OAUTH_GRANT,
ValueType.OBJECT,
@@ -476,7 +476,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_PATH,
ValueType.STRING,
@@ -485,7 +485,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_METHOD,
ValueType.STRING,
@@ -494,7 +494,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_BODY,
null,
@@ -503,7 +503,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_CONTENT_TYPE,
ValueType.STRING,
@@ -512,7 +512,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_SECONDS,
ValueType.NUMBER,
@@ -521,7 +521,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_QUERY_PARAMETERS,
ValueType.OBJECT,
@@ -530,7 +530,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_PING_HEADERS,
ValueType.OBJECT,
@@ -539,7 +539,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PROTOCOL_FOLLOW_REDIRECTS,
ValueType.BOOLEAN,
@@ -548,7 +548,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_QUERY_PARAMETERS,
ValueType.OBJECT,
@@ -557,7 +557,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_QUERY_PARAMETERS,
ValueType.OBJECT,
@@ -566,7 +566,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_FAILURE_CODES,
ValueType.ARRAY,
@@ -575,7 +575,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PAGING_ENABLED,
ValueType.BOOLEAN,
@@ -584,7 +584,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false)
+ false, null, null, null)
);
@@ -597,7 +597,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_ATTRIBUTE_METHOD,
ValueType.STRING,
@@ -606,7 +606,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_ATTRIBUTE_BODY,
null,
@@ -615,7 +615,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_ATTRIBUTE_CONTENT_TYPE,
ValueType.STRING,
@@ -624,7 +624,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_ATTRIBUTE_POLLING_SECONDS,
ValueType.NUMBER,
@@ -633,7 +633,7 @@ public class HttpClientProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_QUERY_PARAMETERS,
ValueType.OBJECT,
@@ -642,7 +642,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_QUERY_PARAMETERS,
ValueType.OBJECT,
@@ -651,7 +651,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_FAILURE_CODES,
ValueType.ARRAY,
@@ -660,7 +660,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_PAGING_ENABLED,
ValueType.BOOLEAN,
@@ -669,7 +669,7 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
1,
null,
- false)
+ false, null, null, null)
);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXProtocol.java
index 602147a85..a7fc20e08 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXProtocol.java
@@ -110,18 +110,18 @@ public class KNXProtocol extends AbstractProtocol implements ProtocolLinkedAttri
public static final String PATTERN_FAILURE_GROUP_ADDRESS = "KNX Group Address (e.g. 1/1/1)";
protected static final List<MetaItemDescriptor> PROTOCOL_CONFIG_META_ITEM_DESCRIPTORS = Arrays.asList(
- new MetaItemDescriptorImpl(META_KNX_GATEWAY_IP, ValueType.STRING, false, null, null, 1, null, false),
- new MetaItemDescriptorImpl(META_KNX_GATEWAY_PORT, ValueType.NUMBER, false, REGEXP_PATTERN_INTEGER_POSITIVE_NON_ZERO, MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(), 1, null, false),
- new MetaItemDescriptorImpl(META_KNX_GATEWAY_USENAT, ValueType.BOOLEAN, false, null, null, 1, Values.create(false), false),
- new MetaItemDescriptorImpl(META_KNX_IP_CONNECTION_TYPE, ValueType.STRING, false, "^(TUNNELLING|ROUTING)$", PATTERN_FAILURE_CONNECTION_TYPE, 1, Values.create("TUNNELLING"), false),
- new MetaItemDescriptorImpl(META_KNX_LOCAL_BUS_ADDRESS, ValueType.STRING, false, REGEXP_BUS_ADDRESS, "0.0.0", 1, null, false),
- new MetaItemDescriptorImpl(META_KNX_LOCAL_IP, ValueType.STRING, false, null, null, 1, null, false)
+ new MetaItemDescriptorImpl(META_KNX_GATEWAY_IP, ValueType.STRING, false, null, null, 1, null, false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_GATEWAY_PORT, ValueType.NUMBER, false, REGEXP_PATTERN_INTEGER_POSITIVE_NON_ZERO, MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(), 1, null, false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_GATEWAY_USENAT, ValueType.BOOLEAN, false, null, null, 1, Values.create(false), false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_IP_CONNECTION_TYPE, ValueType.STRING, false, "^(TUNNELLING|ROUTING)$", PATTERN_FAILURE_CONNECTION_TYPE, 1, Values.create("TUNNELLING"), false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_LOCAL_BUS_ADDRESS, ValueType.STRING, false, REGEXP_BUS_ADDRESS, "0.0.0", 1, null, false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_LOCAL_IP, ValueType.STRING, false, null, null, 1, null, false, null, null, null)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays.asList(
- new MetaItemDescriptorImpl(META_KNX_DPT, ValueType.STRING, true, REGEXP_DPT, PATTERN_FAILURE_DPT, 1, null, false),
- new MetaItemDescriptorImpl(META_KNX_STATUS_GA, ValueType.STRING, false, REGEXP_GROUP_ADDRESS, PATTERN_FAILURE_GROUP_ADDRESS, 1, null, false),
- new MetaItemDescriptorImpl(META_KNX_ACTION_GA, ValueType.STRING, false, REGEXP_GROUP_ADDRESS, PATTERN_FAILURE_GROUP_ADDRESS, 1, Values.create(false), false)
+ new MetaItemDescriptorImpl(META_KNX_DPT, ValueType.STRING, true, REGEXP_DPT, PATTERN_FAILURE_DPT, 1, null, false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_STATUS_GA, ValueType.STRING, false, REGEXP_GROUP_ADDRESS, PATTERN_FAILURE_GROUP_ADDRESS, 1, null, false, null, null, null),
+ new MetaItemDescriptorImpl(META_KNX_ACTION_GA, ValueType.STRING, false, REGEXP_GROUP_ADDRESS, PATTERN_FAILURE_GROUP_ADDRESS, 1, Values.create(false), false, null, null, null)
);
final protected Map<String, KNXConnection> knxConnections = new HashMap<>();
diff --git a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroProtocol.java
index b6f3ce219..6171b183c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroProtocol.java
@@ -59,11 +59,11 @@ public class MacroProtocol extends AbstractProtocol {
protected static final MacroAction EMPTY_ACTION = new MacroAction(new AttributeState(new AttributeRef("ENTITY_ID", "ATTRIBUTE_NAME"), null));
protected static final List<MetaItemDescriptor> PROTOCOL_META_ITEM_DESCRIPTORS = Collections.singletonList(
- new MetaItemDescriptorImpl(META_MACRO_ACTION, ValueType.OBJECT, true, null, null, null, EMPTY_ACTION.toObjectValue(), false)
+ new MetaItemDescriptorImpl(META_MACRO_ACTION, ValueType.OBJECT, true, null, null, null, EMPTY_ACTION.toObjectValue(), false, null, null, null)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
- new MetaItemDescriptorImpl(META_MACRO_ACTION_INDEX, ValueType.NUMBER, false, REGEXP_PATTERN_INTEGER_POSITIVE, MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE.name(), null, null, false)
+ new MetaItemDescriptorImpl(META_MACRO_ACTION_INDEX, ValueType.NUMBER, false, REGEXP_PATTERN_INTEGER_POSITIVE, MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE.name(), null, null, false, null, null, null)
);
class MacroExecutionTask {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java
index fdc99e43d..d9a53c9c4 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java
@@ -133,7 +133,7 @@ public class SimulatorProtocol extends AbstractProtocol {
"WRITE_THROUGH_IMMEDIATE|WRITE_THROUGH_DELAYED|MANUAL",
null,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
CONFIG_WRITE_DELAY_MILLISECONDS,
ValueType.NUMBER,
@@ -142,7 +142,7 @@ public class SimulatorProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE.name(),
null,
null,
- false)
+ false, null, null, null)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
@@ -162,7 +162,7 @@ public class SimulatorProtocol extends AbstractProtocol {
ColorSimulatorElement.ELEMENT_NAME.toUpperCase(Locale.ROOT),
null,
null,
- false)
+ false, null, null, null)
);
// TODO This is not nice, find a better way how the protocol can talk to the service (through message bus?)
diff --git a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerProtocol.java
index d245ef44f..d3f496539 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerProtocol.java
@@ -73,7 +73,7 @@ public class TimerProtocol extends AbstractProtocol {
MetaItemDescriptor.PatternFailure.CRON_EXPRESSION.name(),
null,
null,
- false),
+ false, null, null, null),
new MetaItemDescriptorImpl(
META_TIMER_ACTION,
ValueType.OBJECT,
@@ -82,7 +82,7 @@ public class TimerProtocol extends AbstractProtocol {
null,
null,
null,
- false)
+ false, null, null, null)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
@@ -100,7 +100,7 @@ public class TimerProtocol extends AbstractProtocol {
TimerValue.TIME,
null,
null,
- false)
+ false, null, null, null)
);
protected final Map<AttributeRef, CronExpressionParser> cronExpressionMap = new HashMap<>();
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/AbstractVelbusProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/AbstractVelbusProtocol.java
index 86396a52b..a271abb79 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/AbstractVelbusProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/AbstractVelbusProtocol.java
@@ -76,7 +76,7 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
1,
Values.create(DEFAULT_TIME_INJECTION_INTERVAL_SECONDS),
- false)
+ false, null, null, null)
);
@@ -89,8 +89,8 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
"1-255",
1,
null,
- false
- ),
+ false,
+ null, null, null),
new MetaItemDescriptorImpl(
META_VELBUS_DEVICE_VALUE_LINK,
ValueType.STRING,
@@ -99,8 +99,8 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
null,
1,
null,
- false
- )
+ false,
+ null, null, null)
);
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialProtocol.java
index 6eb2bdfc2..bedd6cfc3 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialProtocol.java
@@ -53,8 +53,8 @@ public class VelbusSerialProtocol extends AbstractVelbusProtocol implements Prot
null,
1,
null,
- false
- ),
+ false,
+ null, null, null),
new MetaItemDescriptorImpl(
META_VELBUS_SERIAL_BAUDRATE,
ValueType.NUMBER,
@@ -63,8 +63,8 @@ public class VelbusSerialProtocol extends AbstractVelbusProtocol implements Prot
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
1,
Values.create(DEFAULT_BAUDRATE),
- false
- )
+ false,
+ null, null, null)
);
@Override
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSocketProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSocketProtocol.java
index f393aac8a..3fe41e8f0 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSocketProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSocketProtocol.java
@@ -50,8 +50,8 @@ public class VelbusSocketProtocol extends AbstractVelbusProtocol {
null,
1,
null,
- false
- ),
+ false,
+ null, null, null),
new MetaItemDescriptorImpl(
META_VELBUS_SOCKET_PORT,
ValueType.NUMBER,
@@ -60,8 +60,8 @@ public class VelbusSocketProtocol extends AbstractVelbusProtocol {
MetaItemDescriptor.PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
1,
null,
- false
- )
+ false,
+ null, null, null)
);
@Override
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
index bcd92b07e..3b713a52a 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
@@ -29,10 +29,10 @@ import org.openremote.model.value.Value;
@JsType(namespace = "Model", name = "AttributeDescriptor")
public class AttributeDescriptorImpl implements AttributeDescriptor {
- protected String attributeName;
- protected AttributeValueDescriptor valueDescriptor;
- protected MetaItemDescriptor[] metaItemDescriptors;
- protected Value initialValue;
+ protected final String attributeName;
+ protected final AttributeValueDescriptor valueDescriptor;
+ protected final MetaItemDescriptor[] metaItemDescriptors;
+ protected final Value initialValue;
@JsIgnore
public AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor) {
@@ -48,7 +48,8 @@ public class AttributeDescriptorImpl implements AttributeDescriptor {
@JsConstructor
public AttributeDescriptorImpl(@JsonProperty("attributeName") String attributeName,
@JsonProperty("valueDescriptor") AttributeValueDescriptor valueDescriptor,
- @JsonProperty("initialValue") Value initialValue, @JsonProperty("metaItemDescriptors") MetaItemDescriptor... metaItemDescriptors) {
+ @JsonProperty("initialValue") Value initialValue,
+ @JsonProperty("metaItemDescriptors") MetaItemDescriptor... metaItemDescriptors) {
this.attributeName = attributeName;
this.valueDescriptor = valueDescriptor;
this.metaItemDescriptors = metaItemDescriptors;
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
index da28515a2..e6dc9a3b1 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
@@ -46,8 +46,14 @@ public enum AttributeValueType implements AttributeValueDescriptor {
NUMBER("hashtag", ValueType.NUMBER),
+ INTEGER("hashtag", ValueType.NUMBER),
+
BOOLEAN("toggle-on", ValueType.BOOLEAN),
+ SWITCH_TOGGLE("toggle-on", ValueType.BOOLEAN),
+
+ SWITCH_MOMENTARY("toggle-on", ValueType.BOOLEAN),
+
OBJECT("cube", ValueType.OBJECT),
ARRAY("bars", ValueType.ARRAY),
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
index 19e61c29c..4463289ce 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
@@ -20,6 +20,7 @@
package org.openremote.model.attribute;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import jsinterop.annotations.JsConstructor;
@@ -168,6 +169,27 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
@JsonProperty
boolean isValueFixed();
+ /**
+ * Indicates the minimum allowed value for instances of this meta item, only makes sense for meta items that
+ * support continuous data types (number, datetime, etc.) otherwise can be <code>null</code>.
+ */
+ @JsonProperty
+ Value getAllowedMin();
+
+ /**
+ * Indicates the maximum allowed value for instances of this meta item, only makes sense for meta items that
+ * support continuous data types (number, datetime, etc.) otherwise can be <code>null</code>.
+ */
+ @JsonProperty
+ Value getAllowedMax();
+
+ /**
+ * Indicates the discreet values allowed for instances of this meta item, only makes sense for meta items that
+ * support a limited number of values otherwise can be <code>null</code>.
+ */
+ @JsonProperty
+ Value[] getAllowedValues();
+
/**
* Get optional validation function; this allows {@link MetaItemDescriptor} implementations to do more advanced
* validation. If defined this takes priority over all other value checks.
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
index e6be983cc..8f0a15a0e 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
@@ -24,12 +24,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import jsinterop.annotations.JsConstructor;
import jsinterop.annotations.JsIgnore;
-import jsinterop.annotations.JsPackage;
import jsinterop.annotations.JsType;
import org.openremote.model.ValidationFailure;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueType;
+import java.util.Arrays;
import java.util.Optional;
import java.util.function.Function;
@@ -43,6 +43,9 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
protected final String pattern;
protected final Integer maxPerAttribute;
protected final Value initialValue;
+ protected final Value allowedMin;
+ protected final Value allowedMax;
+ protected final Value[] allowedValues;
protected final boolean valueFixed;
protected final String patternFailureMessage;
@@ -56,7 +59,10 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
@JsonProperty("patternFailureMessage") String patternFailureMessage,
@JsonProperty("maxPerAttribute") Integer maxPerAttribute,
@JsonProperty("initialValue") Value initialValue,
- @JsonProperty("valueFixed") boolean valueFixed) {
+ @JsonProperty("valueFixed") boolean valueFixed,
+ @JsonProperty("allowedMin")Value allowedMin,
+ @JsonProperty("allowedMax")Value allowedMax,
+ @JsonProperty("allowedValues")Value[] allowedValues) {
this.urn = urn;
this.valueType = valueType;
this.access = access;
@@ -66,6 +72,9 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
this.maxPerAttribute = maxPerAttribute;
this.initialValue = initialValue;
this.valueFixed = valueFixed;
+ this.allowedMin = allowedMin;
+ this.allowedMax = allowedMax;
+ this.allowedValues = allowedValues;
}
@JsIgnore
@@ -82,7 +91,7 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
metaItemDescriptor.getPatternFailureMessage(),
metaItemDescriptor.getMaxPerAttribute(),
initialValue,
- metaItemDescriptor.isValueFixed());
+ metaItemDescriptor.isValueFixed(), null, null, null);
}
@JsIgnore
@@ -93,8 +102,11 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
String patternFailureMessage,
Integer maxPerAttribute,
Value initialValue,
- boolean valueFixed) {
- this(urn, valueType, Access.ACCESS_PRIVATE, required, pattern, patternFailureMessage, maxPerAttribute, initialValue, valueFixed);
+ boolean valueFixed,
+ Value allowedMin,
+ Value allowedMax,
+ Value[] allowedValues) {
+ this(urn, valueType, Access.ACCESS_PRIVATE, required, pattern, patternFailureMessage, maxPerAttribute, initialValue, valueFixed, allowedMin, allowedMax, allowedValues);
}
@Override
@@ -142,6 +154,21 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
return valueFixed;
}
+ @Override
+ public Value getAllowedMin() {
+ return allowedMin;
+ }
+
+ @Override
+ public Value getAllowedMax() {
+ return allowedMax;
+ }
+
+ @Override
+ public Value[] getAllowedValues() {
+ return allowedValues;
+ }
+
@JsonIgnore
@Override
public Optional<Function<Value, Optional<ValidationFailure>>> getValidator() {
@@ -158,6 +185,9 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
", pattern='" + pattern + '\'' +
", maxPerAttribute=" + maxPerAttribute +
", initialValue=" + initialValue +
+ ", allowedMin=" + allowedMin +
+ ", allowedMax=" + allowedMax +
+ ", allowedValues=" + (allowedValues != null ? Arrays.toString(allowedValues) : "null") +
", valueFixed=" + valueFixed +
", patternFailureMessage='" + patternFailureMessage + '\'' +
'}';
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java b/model/src/main/java/org/openremote/model/attribute/MetaItemType.java
index 6eedfa663..dcca2304b 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemType.java
@@ -72,6 +72,9 @@ public enum MetaItemType implements MetaItemDescriptor {
null,
null,
false,
+ null,
+ null,
+ null,
value ->
Optional.ofNullable(AttributeRef.isAttributeRef(value)
? null
@@ -91,6 +94,9 @@ public enum MetaItemType implements MetaItemDescriptor {
null,
null,
false,
+ null,
+ null,
+ null,
value ->
Optional.ofNullable(AttributeLink.isAttributeLink(value)
? null
@@ -301,6 +307,9 @@ public enum MetaItemType implements MetaItemDescriptor {
PatternFailure.INTEGER_POSITIVE_NON_ZERO.name(),
null,
false,
+ Values.create(1d),
+ null,
+ null,
value -> value == null ? Optional.empty() : Values.getIntegerCoerced(value)
.isPresent() ? Optional.empty() : Optional.of(new ValidationFailure(META_ITEM_VALUE_MISMATCH, "Integer"))),
@@ -379,12 +388,28 @@ public enum MetaItemType implements MetaItemDescriptor {
null,
null,
Values.create(true),
- true);
+ true),
+
+ /**
+ * Indicates the discreet values allowed for this attribute, only makes sense for attributes that
+ * support a limited number of values otherwise can be <code>null</code>.
+ */
+ ALLOWED_VALUES(
+ ASSET_META_NAMESPACE + ":allowedValues",
+ new Access(true, false, true),
+ ValueType.ARRAY,
+ null,
+ null,
+ null,
+ false);
final protected String urn;
final protected Access access;
final protected ValueType valueType;
final protected Value initialValue;
+ protected final Value allowedMin;
+ protected final Value allowedMax;
+ protected final Value[] allowedValues;
final protected boolean valueFixed;
final protected Integer maxPerAttribute = 1; // All asset meta so far are single instance
final protected boolean required = false; // All asset meta so far are not mandatory
@@ -393,10 +418,18 @@ public enum MetaItemType implements MetaItemDescriptor {
final protected Function<Value, Optional<ValidationFailure>> validator;
MetaItemType(String urn, Access access, ValueType valueType, String pattern, String patternFailureMessage, Value initialValue, boolean valueFixed) {
- this(urn, access, valueType, pattern, patternFailureMessage, initialValue, valueFixed, null);
+ this(urn, access, valueType, pattern, patternFailureMessage, initialValue, valueFixed, null, null, null, null);
}
- MetaItemType(String urn, Access access, ValueType valueType, String pattern, String patternFailureMessage, Value initialValue, boolean valueFixed, Function<Value, Optional<ValidationFailure>> validator) {
+ MetaItemType(String urn,
+ Access access,
+ ValueType valueType,
+ String pattern,
+ String patternFailureMessage,
+ Value initialValue,
+ boolean valueFixed,
+ Value allowedMin, Value allowedMax, Value[] allowedValues, Function<Value, Optional<ValidationFailure>> validator) {
+
if (initialValue != null && initialValue.getType() != valueType) {
throw new IllegalStateException("Initial asset meta value must be of the same type as the asset meta");
}
@@ -408,6 +441,9 @@ public enum MetaItemType implements MetaItemDescriptor {
this.valueFixed = valueFixed;
this.pattern = pattern;
this.patternFailureMessage = patternFailureMessage;
+ this.allowedMin = allowedMin;
+ this.allowedMax = allowedMax;
+ this.allowedValues = allowedValues;
}
@@ -461,6 +497,21 @@ public enum MetaItemType implements MetaItemDescriptor {
return valueFixed;
}
+ @Override
+ public Value getAllowedMin() {
+ return allowedMin;
+ }
+
+ @Override
+ public Value getAllowedMax() {
+ return allowedMax;
+ }
+
+ @Override
+ public Value[] getAllowedValues() {
+ return allowedValues;
+ }
+
public MetaItemDescriptor withInitialValue(Value initialValue) {
return new MetaItemDescriptorImpl(this, initialValue);
}