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
Added SPECIFIC_TYPE MetaItemType to specify the type of a generic Attribute Added more helper functions to MetaItemType for withInitialValue function
Michael Rademaker095cbfbb5dee
diff --git a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java b/model/src/main/java/org/openremote/model/asset/AssetAttribute.javaindex e6709d38a..a1ee3238a 100644--- a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java+++ b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java@@ -460,6 +460,14 @@ public class AssetAttribute extends Attribute {return copy;}+ public void setSpecificType(String specificType) {+ if (!isNullOrEmpty(specificType)) {+ replaceMetaByName(getMeta(), SPECIFIC_TYPE, Values.create(specificType));+ } else {+ getMeta().removeIf(isMetaNameEqualTo(SPECIFIC_TYPE));+ }+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.javaindex da1c0dbc4..cedd90ae1 100644--- a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java+++ b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java@@ -124,6 +124,8 @@ public enum AttributeValueType implements AttributeValueDescriptor {.map(n -> new ValidationFailure(ValueHolder.ValueFailureReason.VALUE_TEMPERATURE_OUT_OF_RANGE))),+ CURRENCY("money", ValueType.NUMBER, SPECIFIC_TYPE.withInitialValue(Values.create("EUR"))),+RAINFALL("water", ValueType.NUMBER, FORMAT.withInitialValue(Values.create("%0.1f mm/h"))),BRIGHTNESS_LUX("lightbulb", ValueType.NUMBER, FORMAT.withInitialValue(Values.create("%d lx"))),diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java b/model/src/main/java/org/openremote/model/attribute/MetaItemType.javaindex b03d4f3fa..4eb68f8e6 100644--- a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemType.java@@ -21,20 +21,19 @@ package org.openremote.model.attribute;import com.fasterxml.jackson.annotation.JsonIgnore;import org.openremote.model.ValidationFailure;-import org.openremote.model.asset.AssetModelProvider;import org.openremote.model.asset.UserAsset;import org.openremote.model.rules.AssetState;import org.openremote.model.rules.TemporaryFact;-import org.openremote.model.value.*;+import org.openremote.model.value.Value;+import org.openremote.model.value.ValueType;+import org.openremote.model.value.Values;import java.util.Optional;import java.util.function.Function;import static org.openremote.model.Constants.ASSET_META_NAMESPACE;-import static org.openremote.model.Constants.PROTOCOL_NAMESPACE;import static org.openremote.model.attribute.MetaItem.MetaItemFailureReason.META_ITEM_VALUE_MISMATCH;import static org.openremote.model.attribute.MetaItemDescriptor.Access.ACCESS_PRIVATE;-import static org.openremote.model.attribute.MetaItemDescriptorImpl.metaItemArray;import static org.openremote.model.util.TextUtil.REGEXP_PATTERN_DOUBLE;import static org.openremote.model.util.TextUtil.REGEXP_PATTERN_INTEGER_POSITIVE_NON_ZERO;@@ -400,7 +399,22 @@ public enum MetaItemType implements MetaItemDescriptor {null,null,null,- false);+ false),++ /**+ * Indicates the specific type the this attribute represents.+ * For e.g. if the attribute represents currency and it's in euro's then the specific type would be EUR.+ * For e.g. if the attribute represents distance and it's in kilometers then the specific type would be KM.+ */+ SPECIFIC_TYPE(+ ASSET_META_NAMESPACE + ":specificType",+ new Access(true, false, true),+ ValueType.STRING,+ null,+ null,+ null,+ false+ );final protected String urn;final protected Access access;@@ -527,6 +541,22 @@ public enum MetaItemType implements MetaItemDescriptor {return allowedValues;}+ public MetaItemDescriptor withInitialValue(String initialValue) {+ return withInitialValue(Values.create(initialValue));+ }++ public MetaItemDescriptor withInitialValue(int initialValue) {+ return withInitialValue(Values.create(initialValue));+ }++ public MetaItemDescriptor withInitialValue(boolean initialValue) {+ return withInitialValue(Values.create(initialValue));+ }++ public MetaItemDescriptor withInitialValue(double initialValue) {+ return withInitialValue(Values.create(initialValue));+ }+public MetaItemDescriptor withInitialValue(Value initialValue) {return new MetaItemDescriptorImpl(this, initialValue);}