100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Updated AssetModelProvider interface
Rich Turnerd620ed13d1f7
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.javaindex be35d92c1..9fdd5894c 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java@@ -59,7 +59,7 @@ public class AssetModelService implements ContainerService {LOG.fine("Adding asset model descriptors of provider: " + assetModelProvider.getClass().getName());assetDescriptors.addAll(Arrays.asList(assetModelProvider.getAssetDescriptors()));- attributeDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeTypeDescriptors()));+ attributeDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeDescriptors()));attributeValueDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeValueDescriptors()));metaItemDescriptors.addAll(Arrays.asList(assetModelProvider.getMetaItemDescriptors()));});diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.javaindex f8d113e5b..3bc760b0b 100644--- a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java+++ b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java@@ -32,7 +32,7 @@ public interface AssetModelProvider {AssetDescriptor[] getAssetDescriptors();- AttributeDescriptor[] getAttributeTypeDescriptors();+ AttributeDescriptor[] getAttributeDescriptors();AttributeValueDescriptor[] getAttributeValueDescriptors();}diff --git a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.javaindex 8f412ec41..4cd0107fe 100644--- a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java+++ b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java@@ -37,7 +37,7 @@ public class DefaultAssetModelProvider implements AssetModelProvider {}@Override- public AttributeDescriptor[] getAttributeTypeDescriptors() {+ public AttributeDescriptor[] getAttributeDescriptors() {return AttributeType.values();}diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.javaindex 766dc977a..bcd92b07e 100644--- a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java@@ -36,20 +36,19 @@ public class AttributeDescriptorImpl implements AttributeDescriptor {@JsIgnorepublic AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor) {- this(attributeName, valueDescriptor, null, null);+ this(attributeName, valueDescriptor, null, (MetaItemDescriptor) null);}@JsIgnorepublic AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor, Value initialValue) {- this(attributeName, valueDescriptor, null, initialValue);+ this(attributeName, valueDescriptor, initialValue, (MetaItemDescriptor) null);}@JsonCreator@JsConstructorpublic AttributeDescriptorImpl(@JsonProperty("attributeName") String attributeName,@JsonProperty("valueDescriptor") AttributeValueDescriptor valueDescriptor,- @JsonProperty("metaItemDescriptors") MetaItemDescriptor[] metaItemDescriptors,- @JsonProperty("initialValue") Value initialValue) {+ @JsonProperty("initialValue") Value initialValue, @JsonProperty("metaItemDescriptors") MetaItemDescriptor... metaItemDescriptors) {this.attributeName = attributeName;this.valueDescriptor = valueDescriptor;this.metaItemDescriptors = metaItemDescriptors;