Skip to content

armgit / core

Public Imported from GitHub
0

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

Further cleanup of asset model descriptors

Rich Turnerc1e1c0d70d3e
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 36fc32630..288d66479 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
@@ -122,7 +122,6 @@ public abstract class AbstractProtocol implements Protocol {
static {
attributeMetaItemDescriptors = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_FILTERS",
META_PROTOCOL_FILTERS,
ValueType.ARRAY,
false,
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 cc92f2253..c550d0a2a 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
@@ -145,25 +145,25 @@ public class ControllerProtocol extends AbstractProtocol {
public static final int HEARTBEAT_DELAY_SECONDS = 5;
protected static final List<MetaItemDescriptorImpl> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays
- .asList(new MetaItemDescriptorImpl("PROTOCOL_CONTROLLER_BASE_URI", META_PROTOCOL_BASE_URI, ValueType.STRING, true,
+ .asList(new MetaItemDescriptorImpl(META_PROTOCOL_BASE_URI, ValueType.STRING, true,
REGEXP_PATTERN_BASIC_HTTP_URL, MetaItemDescriptor.PatternFailure.HTTP_URL.name(), 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_HTTP_CLIENT_USERNAME", META_PROTOCOL_USERNAME, ValueType.STRING, false,
+ 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),
- new MetaItemDescriptorImpl("PROTOCOL_HTTP_CLIENT_PASSWORD", META_PROTOCOL_PASSWORD, ValueType.STRING, false,
+ 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));
public static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays
- .asList(new MetaItemDescriptorImpl("PROTOCOL_DEVICE_NAME", META_ATTRIBUTE_DEVICE_NAME, ValueType.STRING, false,
+ .asList(new MetaItemDescriptorImpl(META_ATTRIBUTE_DEVICE_NAME, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_SENSOR_NAME", META_ATTRIBUTE_SENSOR_NAME, ValueType.STRING, false,
+ new MetaItemDescriptorImpl(META_ATTRIBUTE_SENSOR_NAME, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_COMMAND_DEVICE_NAME", META_ATTRIBUTE_COMMAND_DEVICE_NAME, ValueType.STRING, false,
+ new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMAND_DEVICE_NAME, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_COMMAND_NAME", META_ATTRIBUTE_COMMAND_NAME, ValueType.STRING, false,
+ new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMAND_NAME, ValueType.STRING, false,
REGEXP_PATTERN_STRING_NON_EMPTY, MetaItemDescriptor.PatternFailure.STRING_EMPTY.name(), 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_COMMANDS_MAP", META_ATTRIBUTE_COMMANDS_MAP, ValueType.OBJECT, false, null, null, 1, null,
+ new MetaItemDescriptorImpl(META_ATTRIBUTE_COMMANDS_MAP, ValueType.OBJECT, false, null, null, 1, null,
false));
/*--------------- Protocol attributes ---------------*/
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 eca86761e..f6741c156 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
@@ -442,7 +442,6 @@ public class HttpClientProtocol extends AbstractProtocol {
protected static final List<MetaItemDescriptorImpl> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_BASE_URI",
META_PROTOCOL_BASE_URI,
ValueType.STRING,
true,
@@ -452,7 +451,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_USERNAME",
META_PROTOCOL_USERNAME,
ValueType.STRING,
false,
@@ -462,7 +460,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PASSWORD",
META_PROTOCOL_PASSWORD,
ValueType.STRING,
false,
@@ -472,7 +469,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_OAUTH",
META_PROTOCOL_OAUTH_GRANT,
ValueType.OBJECT,
false,
@@ -482,7 +478,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_PATH",
META_PROTOCOL_PING_PATH,
ValueType.STRING,
false,
@@ -492,7 +487,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_METHOD",
META_PROTOCOL_PING_METHOD,
ValueType.STRING,
false,
@@ -502,7 +496,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_BODY",
META_PROTOCOL_PING_BODY,
null,
false,
@@ -512,7 +505,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_CONTENT_TYPE",
META_PROTOCOL_PING_CONTENT_TYPE,
ValueType.STRING,
false,
@@ -522,7 +514,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_SECONDS",
META_PROTOCOL_PING_SECONDS,
ValueType.NUMBER,
false,
@@ -532,7 +523,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_QUERY_PARAMETERS",
META_PROTOCOL_PING_QUERY_PARAMETERS,
ValueType.OBJECT,
false,
@@ -542,7 +532,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PING_HEADERS",
META_PROTOCOL_PING_HEADERS,
ValueType.OBJECT,
false,
@@ -552,7 +541,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_FOLLOW_REDIRECTS",
META_PROTOCOL_FOLLOW_REDIRECTS,
ValueType.BOOLEAN,
false,
@@ -562,7 +550,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_QUERY_PARAMETERS",
META_QUERY_PARAMETERS,
ValueType.OBJECT,
false,
@@ -572,7 +559,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_HEADERS",
META_QUERY_PARAMETERS,
ValueType.OBJECT,
false,
@@ -582,7 +568,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_FAILURE_CODES",
META_FAILURE_CODES,
ValueType.ARRAY,
false,
@@ -592,7 +577,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PAGING_ENABLED",
META_PAGING_ENABLED,
ValueType.BOOLEAN,
false,
@@ -606,7 +590,6 @@ public class HttpClientProtocol extends AbstractProtocol {
public static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PATH",
META_ATTRIBUTE_PATH,
ValueType.STRING,
false,
@@ -616,7 +599,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_METHOD",
META_ATTRIBUTE_METHOD,
ValueType.STRING,
false,
@@ -626,7 +608,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_BODY",
META_ATTRIBUTE_BODY,
null,
false,
@@ -636,7 +617,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_CONTENT_TYPE",
META_ATTRIBUTE_CONTENT_TYPE,
ValueType.STRING,
false,
@@ -646,7 +626,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_POLLING_SECONDS",
META_ATTRIBUTE_POLLING_SECONDS,
ValueType.NUMBER,
false,
@@ -656,7 +635,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_QUERY_PARAMETERS",
META_QUERY_PARAMETERS,
ValueType.OBJECT,
false,
@@ -666,7 +644,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_HEADERS",
META_QUERY_PARAMETERS,
ValueType.OBJECT,
false,
@@ -676,7 +653,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_FAILURE_CODES",
META_FAILURE_CODES,
ValueType.ARRAY,
false,
@@ -686,7 +662,6 @@ public class HttpClientProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_HTTP_CLIENT_PAGING_ENABLED",
META_PAGING_ENABLED,
ValueType.BOOLEAN,
false,
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 3071be43a..602147a85 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("PROTOCOL_KNX_IP", META_KNX_GATEWAY_IP, ValueType.STRING, false, null, null, 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_PORT", 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("PROTOCOL_KNX_USENAT", META_KNX_GATEWAY_USENAT, ValueType.BOOLEAN, false, null, null, 1, Values.create(false), false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_CONNECTION_TYPE", META_KNX_IP_CONNECTION_TYPE, ValueType.STRING, false, "^(TUNNELLING|ROUTING)$", PATTERN_FAILURE_CONNECTION_TYPE, 1, Values.create("TUNNELLING"), false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_LOCAL_BUS_ADDRESS", META_KNX_LOCAL_BUS_ADDRESS, ValueType.STRING, false, REGEXP_BUS_ADDRESS, "0.0.0", 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_LOCAL_IP", 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),
+ 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)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays.asList(
- new MetaItemDescriptorImpl("PROTOCOL_KNX_DPT", META_KNX_DPT, ValueType.STRING, true, REGEXP_DPT, PATTERN_FAILURE_DPT, 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_STATUS_GA", META_KNX_STATUS_GA, ValueType.STRING, false, REGEXP_GROUP_ADDRESS, PATTERN_FAILURE_GROUP_ADDRESS, 1, null, false),
- new MetaItemDescriptorImpl("PROTOCOL_KNX_ACTION_GA", 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),
+ 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)
);
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 43eaaafe6..b6f3ce219 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("PROTOCOL_MACRO_ACTION", 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)
);
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
- new MetaItemDescriptorImpl("PROTOCOL_MACRO_ACTION_INDEX", 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)
);
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 bf63aef2a..fdc99e43d 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
@@ -125,7 +125,7 @@ public class SimulatorProtocol extends AbstractProtocol {
final protected Map<AttributeRef, SimulatorElement> elements = new HashMap<>();
protected static final List<MetaItemDescriptor> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays.asList(
- new MetaItemDescriptorImpl("PROTOCOL_SIMULATOR_MODE",
+ new MetaItemDescriptorImpl(
CONFIG_MODE,
ValueType.STRING,
false,
@@ -135,7 +135,6 @@ public class SimulatorProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_SIMULATOR_WRITE_DELAY",
CONFIG_WRITE_DELAY_MILLISECONDS,
ValueType.NUMBER,
false,
@@ -148,7 +147,6 @@ public class SimulatorProtocol extends AbstractProtocol {
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
new MetaItemDescriptorImpl(
- "PROTOCOL_SIMULATOR_ELEMENT",
SIMULATOR_ELEMENT,
ValueType.STRING,
true,
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 72c5402cd..a097c43b7 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
@@ -65,7 +65,7 @@ public class TimerProtocol extends AbstractProtocol {
protected static final String VERSION = "1.0";
protected static final List<MetaItemDescriptor> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays.asList(
- new MetaItemDescriptorImpl("PROTOCOL_TIMER_CRON",
+ new MetaItemDescriptorImpl(
META_TIMER_CRON_EXPRESSION,
ValueType.STRING,
true,
@@ -75,7 +75,6 @@ public class TimerProtocol extends AbstractProtocol {
null,
false),
new MetaItemDescriptorImpl(
- "PROTOCOL_TIMER_ACTION",
META_TIMER_ACTION,
ValueType.OBJECT,
true,
@@ -88,7 +87,6 @@ public class TimerProtocol extends AbstractProtocol {
protected static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Collections.singletonList(
new MetaItemDescriptorImpl(
- "PROTOCOL_TIMER_LINK",
META_TIMER_VALUE_LINK,
ValueType.STRING,
true,
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 dbfc02f24..86396a52b 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
@@ -69,7 +69,6 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
protected static final String VERSION = "1.0";
protected static final List<MetaItemDescriptorImpl> META_ITEM_DESCRIPTORS = Collections.singletonList(
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_TIME_INJECTION_INTERVAL_SECONDS",
META_VELBUS_TIME_INJECTION_INTERVAL_SECONDS,
ValueType.NUMBER,
false,
@@ -83,7 +82,6 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
public static final List<MetaItemDescriptor> ATTRIBUTE_META_ITEM_DESCRIPTORS = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_DEVICE_ADDRESS",
META_VELBUS_DEVICE_ADDRESS,
ValueType.NUMBER,
true,
@@ -94,7 +92,6 @@ public abstract class AbstractVelbusProtocol extends AbstractProtocol implements
false
),
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_DEVICE_LINK",
META_VELBUS_DEVICE_VALUE_LINK,
ValueType.STRING,
true,
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 d1762d791..6eb2bdfc2 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
@@ -46,7 +46,6 @@ public class VelbusSerialProtocol extends AbstractVelbusProtocol implements Prot
public static final int DEFAULT_BAUDRATE = 38400;
public static final List<MetaItemDescriptorImpl> PROTOCOL_META_ITEM_DESCRIPTORS = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_SERIAL_PORT",
META_VELBUS_SERIAL_PORT,
ValueType.STRING,
true,
@@ -57,7 +56,6 @@ public class VelbusSerialProtocol extends AbstractVelbusProtocol implements Prot
false
),
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_SERIAL_BAUDRATE",
META_VELBUS_SERIAL_BAUDRATE,
ValueType.NUMBER,
false,
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 f6deca1cd..f393aac8a 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
@@ -43,7 +43,6 @@ public class VelbusSocketProtocol extends AbstractVelbusProtocol {
public static final String META_VELBUS_SOCKET_PORT = PROTOCOL_NAME + ":port";
public static final List<MetaItemDescriptorImpl> META_ITEM_DESCRIPTORS = Arrays.asList(
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_SOCKET_HOST",
META_VELBUS_SOCKET_HOST,
ValueType.STRING,
true,
@@ -54,7 +53,6 @@ public class VelbusSocketProtocol extends AbstractVelbusProtocol {
false
),
new MetaItemDescriptorImpl(
- "PROTOCOL_VELBUS_SOCKET_PORT",
META_VELBUS_SOCKET_PORT,
ValueType.NUMBER,
true,
diff --git a/client/src/main/java/org/openremote/app/client/assets/attributes/MetaEditor.java b/client/src/main/java/org/openremote/app/client/assets/attributes/MetaEditor.java
index 4ba50a41f..faf41c5f8 100644
--- a/client/src/main/java/org/openremote/app/client/assets/attributes/MetaEditor.java
+++ b/client/src/main/java/org/openremote/app/client/assets/attributes/MetaEditor.java
@@ -144,7 +144,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
Arrays.stream(metaItemDescriptors)
.forEach(metaItemDescriptor -> {
- String name = getMetaItemDisplayName(environment, metaItemDescriptor.getName());
+ String name = getMetaItemDisplayName(environment, metaItemDescriptor.getUrn());
nameList.addItem(name, metaItemDescriptor.getUrn());
});
}
@@ -204,7 +204,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
}
}
- nameLabel.setText(currentMetaItemDescriptor.map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getName())).orElse(urn));
+ nameLabel.setText(currentMetaItemDescriptor.map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getUrn())).orElse(urn));
nameInput.setVisible(!currentMetaItemDescriptor.isPresent());
typeList.setVisible(!currentMetaItemDescriptor.isPresent());
typeList.selectItem(typeListValue);
@@ -325,7 +325,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
return metaItemDescriptor != MetaItemType.PROTOCOL_CONFIGURATION &&
(!isProtocolConfiguration || metaItemDescriptor != MetaItemType.AGENT_LINK);
})
- .sorted(Comparator.comparing(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getName())))
+ .sorted(Comparator.comparing(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getUrn())))
.toArray(MetaItemDescriptor[]::new);
// Refresh the new item meta item editor
@@ -460,7 +460,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
.orElse(true);
if (!canAdd) {
- showValidationError(attribute.getName().orElse(""), null, new ValidationFailure(MetaItem.MetaItemFailureReason.META_ITEM_DUPLICATION, getMetaItemDisplayName(environment, descriptor[0].getName())));
+ showValidationError(attribute.getName().orElse(""), null, new ValidationFailure(MetaItem.MetaItemFailureReason.META_ITEM_DUPLICATION, getMetaItemDisplayName(environment, descriptor[0].getUrn())));
return false;
}
@@ -536,7 +536,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
.map(parameter ->
// Parameter should be meta item name URN
getMetaItemDescriptor(parameter)
- .map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getName()))
+ .map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getUrn()))
.orElse(parameter)
)
.orElse("")
@@ -560,7 +560,7 @@ public class MetaEditor extends AbstractAttributeViewExtension {
if (failures != null) {
Optional<MetaItemDescriptor> optionalMetaItemDescriptor = metaItemEditor.getCurrentDescriptor();
String displayName = optionalMetaItemDescriptor
- .map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getName()))
+ .map(metaItemDescriptor -> getMetaItemDisplayName(environment, metaItemDescriptor.getUrn()))
.orElse(metaItemEditor.getItem().getName().orElse(""));
failures.forEach(failure -> {
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
index b89a9f7dd..50593fcd9 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
@@ -42,7 +42,7 @@ public class AssetModelResourceImpl extends ManagerWebResource implements AssetM
}
@Override
- public AttributeDescriptor[] getAttributeTypeDescriptors(RequestParams requestParams) {
+ public AttributeDescriptor[] getAttributeDescriptors(RequestParams requestParams) {
return AssetModelUtil.getAttributeDescriptors();
}
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 09b10e476..ef0fef5c6 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
@@ -30,12 +30,12 @@ public interface AssetDescriptor {
@JsonProperty
String getName();
-
+ @JsonProperty
String getType();
-
+ @JsonProperty
String getIcon();
-
+ @JsonProperty
boolean getAccessPublicRead();
-
+ @JsonProperty
AttributeDescriptor[] getAttributeDescriptors();
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
index c37591764..ae89c7313 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
@@ -55,7 +55,7 @@ public interface AssetModelResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- AttributeDescriptor[] getAttributeTypeDescriptors(@BeanParam RequestParams requestParams);
+ AttributeDescriptor[] getAttributeDescriptors(@BeanParam RequestParams requestParams);
/**
* Retrieve attribute type descriptors {@link AttributeValueDescriptor} present.
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
index db0e3444f..39280480b 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
@@ -30,9 +30,6 @@ import java.util.Optional;
@JsonDeserialize(as = AttributeDescriptorImpl.class)
public interface AttributeDescriptor {
- @JsonProperty
- String getName();
-
@JsonProperty
String getAttributeName();
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 38d5d4b75..87337d7f0 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
@@ -25,30 +25,33 @@ import org.openremote.model.value.Value;
public class AttributeDescriptorImpl implements AttributeDescriptor {
- protected String name;
protected String attributeName;
protected AttributeValueDescriptor valueDescriptor;
protected MetaItemDescriptor[] metaItemDescriptors;
protected Value initialValue;
+ public AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor) {
+ this.attributeName = attributeName;
+ this.valueDescriptor = valueDescriptor;
+ }
+
+ public AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor, Value initialValue) {
+ this.attributeName = attributeName;
+ this.valueDescriptor = valueDescriptor;
+ this.initialValue = initialValue;
+ }
+
@JsonCreator
- public AttributeDescriptorImpl(@JsonProperty("name") String name,
- @JsonProperty("attributeName") String attributeName,
+ public AttributeDescriptorImpl(@JsonProperty("attributeName") String attributeName,
@JsonProperty("valueDescriptor") AttributeValueDescriptor valueDescriptor,
@JsonProperty("metaItemDescriptors") MetaItemDescriptor[] metaItemDescriptors,
@JsonProperty("initialValue") Value initialValue) {
- this.name = name;
this.attributeName = attributeName;
this.valueDescriptor = valueDescriptor;
this.metaItemDescriptors = metaItemDescriptors;
this.initialValue = initialValue;
}
- @Override
- public String getName() {
- return name;
- }
-
@Override
public String getAttributeName() {
return attributeName;
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeType.java b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
index b0f670d91..6689568a8 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeType.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
@@ -22,16 +22,10 @@ package org.openremote.model.attribute;
import org.openremote.model.value.Value;
import org.openremote.model.value.Values;
-import java.util.Optional;
-
import static org.openremote.model.attribute.MetaItemType.*;
public enum AttributeType implements AttributeDescriptor {
- STRING("string", AttributeValueType.STRING),
-
- NUMBER("number", AttributeValueType.NUMBER),
-
CONSOLE_NAME("consoleName", AttributeValueType.STRING),
CONSOLE_VERSION("consoleVersion", AttributeValueType.STRING),
@@ -84,23 +78,6 @@ public enum AttributeType implements AttributeDescriptor {
this.initialValue = initialValue;
}
- public static Optional<AttributeDescriptor> getByValue(String name) {
- if (name == null)
- return Optional.empty();
-
- for (AttributeDescriptor descriptor : values()) {
- if (name.equals(descriptor.getAttributeName()))
- return Optional.of(descriptor);
- }
- return Optional.empty();
- }
-
-
- @Override
- public String getName() {
- return name();
- }
-
@Override
public String getAttributeName() {
return attributeName;
@@ -120,13 +97,4 @@ public enum AttributeType implements AttributeDescriptor {
public Value getInitialValue() {
return initialValue;
}
-
- public AttributeDescriptor withName(String name, MetaItemDescriptor... metaItemDescriptors) {
- return withName(name, initialValue, metaItemDescriptors);
- }
-
- public AttributeDescriptor withName(String name, Value initialValue, MetaItemDescriptor... metaItemDescriptors) {
-
- return new AttributeDescriptorImpl(name, attributeName, valueDescriptor, metaItemDescriptors, initialValue);
- }
}
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 6bb0804a7..211a725f9 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
@@ -110,15 +110,15 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
}
@JsonProperty
- String getName();
-
String getUrn();
+ @JsonProperty
ValueType getValueType();
/**
* Access permissions for read/write operations performed by restricted or public clients.
*/
+ @JsonProperty
Access getAccess();
/**
@@ -126,11 +126,13 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
* <p>
* TODO Currently not used.
*/
+ @JsonProperty
boolean isRequired();
/**
* A regex pattern that can be used for basic validation, can be <code>null</code> to disable validation.
*/
+ @JsonProperty
String getPattern();
/**
@@ -139,21 +141,25 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
* <p>
* Values defined in {@link PatternFailure} should support localisation.
*/
+ @JsonProperty
String getPatternFailureMessage();
/**
* Gets the maximum number of these meta items allowed per attribute.
*/
+ @JsonProperty
Integer getMaxPerAttribute();
/**
* Gets the initial value for new instances of this meta item, can be <code>null</code>.
*/
+ @JsonProperty
Value getInitialValue();
/**
* Indicates if the value of this meta item is fixed and can't be edited.
*/
+ @JsonProperty
boolean isValueFixed();
/**
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 8da83e0c4..54f440581 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
@@ -31,7 +31,6 @@ import java.util.function.Function;
public class MetaItemDescriptorImpl implements MetaItemDescriptor {
- protected final String name;
protected final String urn;
protected final ValueType valueType;
protected final Access access;
@@ -47,8 +46,7 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
}
public MetaItemDescriptorImpl(MetaItemDescriptor metaItemDescriptor, Value initialValue) {
- this(metaItemDescriptor.getName(),
- metaItemDescriptor.getUrn(),
+ this(metaItemDescriptor.getUrn(),
metaItemDescriptor.getValueType(),
metaItemDescriptor.isRequired(),
metaItemDescriptor.getPattern(),
@@ -58,8 +56,7 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
metaItemDescriptor.isValueFixed());
}
- public MetaItemDescriptorImpl(String name,
- String urn,
+ public MetaItemDescriptorImpl(String urn,
ValueType valueType,
boolean required,
String pattern,
@@ -67,12 +64,11 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
Integer maxPerAttribute,
Value initialValue,
boolean valueFixed) {
- this(name, urn, valueType, Access.ACCESS_PRIVATE, required, pattern, patternFailureMessage, maxPerAttribute, initialValue, valueFixed);
+ this(urn, valueType, Access.ACCESS_PRIVATE, required, pattern, patternFailureMessage, maxPerAttribute, initialValue, valueFixed);
}
@JsonCreator
- public MetaItemDescriptorImpl(@JsonProperty("name") String name,
- @JsonProperty("urn") String urn,
+ public MetaItemDescriptorImpl(@JsonProperty("urn") String urn,
@JsonProperty("valueType") ValueType valueType,
@JsonProperty("access") Access access,
@JsonProperty("required") boolean required,
@@ -81,7 +77,6 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
@JsonProperty("maxPerAttribute") Integer maxPerAttribute,
@JsonProperty("initialValue") Value initialValue,
@JsonProperty("valueFixed") boolean valueFixed) {
- this.name = name;
this.urn = urn;
this.valueType = valueType;
this.access = access;
@@ -93,11 +88,6 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
this.valueFixed = valueFixed;
}
- @Override
- public String getName() {
- return name;
- }
-
@Override
public String getUrn() {
return urn;
@@ -152,7 +142,6 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "name='" + name + '\'' +
", urn='" + urn + '\'' +
", valueType=" + valueType +
", access=" + access +
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 ed60de587..6eedfa663 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemType.java
@@ -411,11 +411,6 @@ public enum MetaItemType implements MetaItemDescriptor {
}
- @Override
- public String getName() {
- return this.name();
- }
-
@Override
public String getUrn() {
return urn;
diff --git a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
index 872889a69..ce501a6a9 100644
--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
@@ -101,13 +101,13 @@ public class AssetModelUtil {
return Optional.empty();
}
- public static Optional<AssetDescriptor> getAssetDescriptor(String urn) {
- if (urn == null)
+ public static Optional<AssetDescriptor> getAssetDescriptor(String assetType) {
+ if (assetType == null)
return Optional.empty();
- for (AssetDescriptor assetType : assetDescriptors) {
- if (urn.equals(assetType.getType()))
- return Optional.of(assetType);
+ for (AssetDescriptor assetDescriptor : assetDescriptors) {
+ if (assetType.equals(assetDescriptor.getType()))
+ return Optional.of(assetDescriptor);
}
return Optional.empty();
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index cd4a7d3d8..2d6c3d92b 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -67,7 +67,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
assetDescriptors[0].name == CUSTOM.name
assetDescriptors[1].name == BUILDING.name
assetDescriptors[1].attributeDescriptors.length == 5
- assetDescriptors[1].attributeDescriptors.find {it.name == AttributeType.SURFACE_AREA.name}.valueDescriptor.valueType == ValueType.NUMBER
+ assetDescriptors[1].attributeDescriptors.find {it.attributeName == AttributeType.SURFACE_AREA.attributeName}.valueDescriptor.valueType == ValueType.NUMBER
assetDescriptors[2].name == FLOOR.name
assetDescriptors[3].name == RESIDENCE.name
assetDescriptors[4].name == ROOM.name
@@ -77,12 +77,10 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
when: "a request for Attribute types is made"
- def attributeTypeDescriptors = assetModelResource.getAttributeTypeDescriptors(null)
+ def attributeTypeDescriptors = assetModelResource.getAttributeDescriptors(null)
then: "the default types should be present"
- attributeTypeDescriptors.size() == 13
- attributeTypeDescriptors.any {it.attributeName == "string"}
- attributeTypeDescriptors.any {it.attributeName == "number"}
+ attributeTypeDescriptors.size() == 11
attributeTypeDescriptors.any {it.attributeName == "consoleName"}
attributeTypeDescriptors.any {it.attributeName == "consoleVersion"}
attributeTypeDescriptors.any {it.attributeName == "consolePlatform"}