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
GWT jackson updates/bug fixes
Rich Turnerc5776bbb2c22
diff --git a/model/src/main/java/org/openremote/model/AbstractValueTimestampHolder.java b/model/src/main/java/org/openremote/model/AbstractValueTimestampHolder.javaindex 5a9a1f332..cf8a31073 100644--- a/model/src/main/java/org/openremote/model/AbstractValueTimestampHolder.java+++ b/model/src/main/java/org/openremote/model/AbstractValueTimestampHolder.java@@ -54,8 +54,12 @@ public abstract class AbstractValueTimestampHolder extends AbstractValueHolder {*/@JsonProperty@SuppressWarnings("unchecked")- public void setValueTimestamp(long timestamp) {- getObjectValue().put(VALUE_TIMESTAMP_FIELD_NAME, Values.create(timestamp));+ public void setValueTimestamp(Long timestamp) {+ if (timestamp == null) {+ clearTimestamp();+ } else {+ getObjectValue().put(VALUE_TIMESTAMP_FIELD_NAME, Values.create(timestamp));+ }}@Overridediff --git a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java b/model/src/main/java/org/openremote/model/asset/AssetAttribute.javaindex 5c00e3314..66c291133 100644--- a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java+++ b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java@@ -19,7 +19,9 @@*/package org.openremote.model.asset;+import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonIgnore;+import com.fasterxml.jackson.annotation.JsonProperty;import org.openremote.model.AbstractValueHolder;import org.openremote.model.ValidationFailure;import org.openremote.model.attribute.*;@@ -120,6 +122,21 @@ public class AssetAttribute extends Attribute {setAssetId(assetId);}+ @JsonCreator+ private AssetAttribute(@JsonProperty("assetId") String assetId,+ @JsonProperty("name") String name,+ @JsonProperty("type") AttributeValueDescriptor type,+ @JsonProperty("meta") List<MetaItem> metaItems,+ @JsonProperty("value") Value value,+ @JsonProperty("timestamp") Long timestamp) {+ super(name, type, value);+ setValueTimestamp(timestamp);+ if (assetId != null) {+ setAssetId(assetId);+ }+ setMeta(metaItems);+ }+public Optional<String> getAssetId() {return Optional.ofNullable(assetId);}@@ -155,18 +172,26 @@ public class AssetAttribute extends Attribute {return super.getMetaItemValidationFailures(item, metaItemDescriptor);}+ @JsonIgnore@Overridepublic AssetAttribute setMeta(Meta meta) {super.setMeta(meta);return this;}+ @JsonIgnore@Overridepublic AssetAttribute setMeta(MetaItem... meta) {super.setMeta(meta);return this;}+ @JsonProperty("meta")+ @Override+ public void setMeta(List<MetaItem> metaItems) {+ super.setMeta(metaItems);+ }+public AssetAttribute addMeta(MetaItem... meta) {if (meta != null) {getMeta().addAll(Arrays.asList(meta));diff --git a/model/src/main/java/org/openremote/model/attribute/Attribute.java b/model/src/main/java/org/openremote/model/attribute/Attribute.javaindex bd17cab60..18d618e35 100644--- a/model/src/main/java/org/openremote/model/attribute/Attribute.java+++ b/model/src/main/java/org/openremote/model/attribute/Attribute.java@@ -114,6 +114,11 @@ public abstract class Attribute extends AbstractValueTimestampHolder {return getObjectValue().getString(TYPE_FIELD_NAME).flatMap(AssetModelUtil::getAttributeValueDescriptor);}+ @JsonProperty("type")+ private AttributeValueDescriptor getTypeInternal() {+ return getType().orElse(null);+ }+/*** The below is used in a sufficient number of places to provide it here as a utility method* with a standardised exception message.@@ -123,6 +128,7 @@ public abstract class Attribute extends AbstractValueTimestampHolder {return getType().orElseThrow(() -> new IllegalStateException("Attribute doesn't have a type"));}+ @JsonPropertypublic void setType(AttributeValueDescriptor type) {Objects.requireNonNull(type);getObjectValue().put(TYPE_FIELD_NAME, Values.create(type.getName()));@@ -186,6 +192,18 @@ public abstract class Attribute extends AbstractValueTimestampHolder {return getMetaItem(hasUniqueResourceName.getUrn());}+ @JsonIgnore+ public Attribute setMeta(Meta meta) {+ setMeta((List<MetaItem>) meta);+ return this;+ }++ @JsonIgnore+ public Attribute setMeta(MetaItem... meta) {+ setMeta(Arrays.asList(meta));+ return this;+ }+@JsonProperty("meta")public void setMeta(List<MetaItem> metaItems) {Meta meta;@@ -203,16 +221,6 @@ public abstract class Attribute extends AbstractValueTimestampHolder {getObjectValue().put(META_FIELD_NAME, meta.getArrayValue());}- public Attribute setMeta(Meta meta) {- setMeta((List<MetaItem>) meta);- return this;- }-- public Attribute setMeta(MetaItem... meta) {- setMeta(Arrays.asList(meta));- return this;- }-@Overridepublic List<ValidationFailure> getValidationFailures() {return getValidationFailures(true);@@ -227,8 +235,9 @@ public abstract class Attribute extends AbstractValueTimestampHolder {if (!getType().isPresent())failures.add(new ValidationFailure(ATTRIBUTE_TYPE_MISSING));- if (!getValueTimestamp().isPresent())- failures.add(new ValidationFailure(ATTRIBUTE_VALUE_TIMESTAMP_MISSING));+ // Timestamp can be null to be set by the server+// if (!getValueTimestamp().isPresent())+// failures.add(new ValidationFailure(ATTRIBUTE_VALUE_TIMESTAMP_MISSING));// Value can be empty, if it's not it must validate with the typegetValue().flatMap(value ->