Skip to content

armgit / core

Public Imported from GitHub
0

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

Updated AssetModelProvider interface

Rich Turner5c2ab2814cdb
diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
index 4f69e5946..647e64cb7 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
@@ -20,6 +20,7 @@
package org.openremote.model.asset;
import org.openremote.model.attribute.AttributeDescriptor;
+import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItemDescriptor;
/**
@@ -32,4 +33,6 @@ public interface AssetModelProvider {
AssetDescriptor[] getAssetTypeDescriptors();
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.java
index 9aec0d55c..58665d703 100644
--- a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
@@ -19,9 +19,7 @@
*/
package org.openremote.model.asset;
-import org.openremote.model.attribute.AttributeDescriptor;
-import org.openremote.model.attribute.AttributeType;
-import org.openremote.model.attribute.MetaItemDescriptor;
+import org.openremote.model.attribute.*;
/**
* The built-in and well-known asset model.
@@ -43,6 +41,11 @@ public class DefaultAssetModelProvider implements AssetModelProvider {
return AttributeType.values();
}
+ @Override
+ public AttributeValueDescriptor[] getAttributeValueDescriptors() {
+ return AttributeValueType.values();
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{}";