Skip to content

armgit / core

Public Imported from GitHub
0

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

Minor model JACKSON updates

Rich Turnera81094d1789b
diff --git a/model/src/main/java/org/openremote/model/ModelModule.java b/model/src/main/java/org/openremote/model/ModelModule.java
index e2f4b1c94..c983eb55a 100644
--- a/model/src/main/java/org/openremote/model/ModelModule.java
+++ b/model/src/main/java/org/openremote/model/ModelModule.java
@@ -19,20 +19,22 @@
*/
package org.openremote.model;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import org.openremote.model.asset.AssetDescriptor;
+import org.openremote.model.asset.AssetDescriptorImpl;
+import org.openremote.model.attribute.*;
import org.openremote.model.geo.Position;
+import org.openremote.model.util.AssetModelUtil;
import org.openremote.model.value.*;
import java.io.IOException;
+import java.util.function.Function;
public class ModelModule extends SimpleModule {
@@ -84,6 +86,34 @@ public class ModelModule extends SimpleModule {
}
}
+ public static class AttributeValueDescriptorSerializer extends JsonSerializer<Position> {
+
+ @Override
+ public void serialize(Position value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException {
+ gen.writeArray(value.getValues(), 0, value.getValues().length);
+ }
+ }
+
+ public static class DescriptorDeserializer<T, U extends T> extends JsonDeserializer<T> {
+
+ protected Function<String, T> descriptorNameFinder;
+ protected Class<U> implClass;
+
+ public DescriptorDeserializer(Function<String, T> descriptorNameFinder, Class<U> implClass) {
+ this.descriptorNameFinder = descriptorNameFinder;
+ this.implClass = implClass;
+ }
+
+ @Override
+ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+ JsonNode node = p.getCodec().readTree(p);
+ if (node instanceof TextNode) {
+ return descriptorNameFinder.apply(node.textValue());
+ } else {
+ return p.getCodec().treeToValue(node, implClass);
+ }
+ }
+ }
@SuppressWarnings("unchecked")
public ModelModule() {
@@ -101,5 +131,21 @@ public class ModelModule extends SimpleModule {
PositionDeserializer positionDeserializer = new PositionDeserializer();
this.addSerializer(Position.class, positionSerializer);
this.addDeserializer(Position.class, positionDeserializer);
+ this.addDeserializer(AssetDescriptor.class, new DescriptorDeserializer<>(
+ name -> AssetModelUtil.getAssetDescriptor(name).orElse(null),
+ AssetDescriptorImpl.class
+ ));
+ this.addDeserializer(AttributeDescriptor.class, new DescriptorDeserializer<>(
+ name -> AssetModelUtil.getAttributeDescriptor(name).orElse(null),
+ AttributeDescriptorImpl.class
+ ));
+ this.addDeserializer(AttributeValueDescriptor.class, new DescriptorDeserializer<>(
+ name -> AssetModelUtil.getAttributeValueDescriptor(name).orElse(null),
+ AttributeValueDescriptorImpl.class
+ ));
+ this.addDeserializer(MetaItemDescriptor.class, new DescriptorDeserializer<>(
+ urn -> AssetModelUtil.getMetaItemDescriptor(urn).orElse(null),
+ MetaItemDescriptorImpl.class
+ ));
}
}
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index 2c4fc0d92..30a2fb565 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.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.hibernate.annotations.Check;
import org.hibernate.annotations.Formula;
import org.openremote.model.AbstractValueHolder;
@@ -319,9 +321,19 @@ public class Asset implements IdentifiableEntity {
}
}
- public Asset(String id, long version, Date createdOn, String name, String type, boolean accessPublicRead,
- String parentId, String parentName, String parentType,
- String realm, String[] path, ObjectValue attributes) {
+ @JsonCreator
+ public Asset(@JsonProperty("id") String id,
+ @JsonProperty("version") long version,
+ @JsonProperty("createdOn") Date createdOn,
+ @JsonProperty("name") String name,
+ @JsonProperty("type") String type,
+ @JsonProperty("accessPublicRead") boolean accessPublicRead,
+ @JsonProperty("parentId") String parentId,
+ @JsonProperty("parentName") String parentName,
+ @JsonProperty("parentType") String parentType,
+ @JsonProperty("realm") String realm,
+ @JsonProperty("path") String[] path,
+ @JsonProperty("attributes") ObjectValue attributes) {
this(name, type, accessPublicRead, null, realm);
this.id = id;
this.version = version;
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 5f1b1b273..5f056a2db 100644
--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
@@ -106,7 +106,7 @@ public class AssetModelUtil {
if (isNullOrEmpty(urn))
return Optional.empty();
for (MetaItemDescriptor metaItemDescriptor : metaItemDescriptors) {
- if (metaItemDescriptor.getUrn().equals(urn))
+ if (metaItemDescriptor.getUrn().equalsIgnoreCase(urn))
return Optional.of(metaItemDescriptor);
}
return Optional.empty();
@@ -128,7 +128,7 @@ public class AssetModelUtil {
return Optional.empty();
for (AttributeDescriptor attributeDescriptor : attributeDescriptors) {
- if (name.equals(attributeDescriptor.getAttributeName()))
+ if (name.equalsIgnoreCase(attributeDescriptor.getAttributeName()))
return Optional.of(attributeDescriptor);
}
return Optional.empty();
@@ -139,7 +139,7 @@ public class AssetModelUtil {
return Optional.empty();
for (AttributeValueDescriptor attributeValueDescriptor : attributeValueDescriptors) {
- if (name.equals(attributeValueDescriptor.getName()))
+ if (name.equalsIgnoreCase(attributeValueDescriptor.getName()))
return Optional.of(attributeValueDescriptor);
}
return Optional.empty();