Skip to content

armgit / core

Public Imported from GitHub
0

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

Descriptor fix for manager GWT client

Rich Turneradc04af3c880
diff --git a/client/src/main/webapp/src/or-app/or-app.html b/client/src/main/webapp/src/or-app/or-app.html
index 918792df1..cdbe0c324 100644
--- a/client/src/main/webapp/src/or-app/or-app.html
+++ b/client/src/main/webapp/src/or-app/or-app.html
@@ -578,6 +578,29 @@
dispatchEvent(new CustomEvent("AppReady", {detail: {app: openremote.INSTANCE}}));
}
+ // Load descriptors
+ openremote.INSTANCE.requests.sendAndReturn(
+ (requestParams) => {
+ openremote.REST.AssetModelResource.getAttributeValueDescriptors(requestParams);
+ },
+ 200,
+ (response) => {
+ if (Array.isArray(response)) {
+ let avds = response.map(av => {
+ let metaItemDescriptors = [];
+ if (av.metaItemDescriptors) {
+ metaItemDescriptors = av.metaItemDescriptors.map(mid => {
+ let access = mid.access ? new Model.MetaItemDescriptorAccess(mid.access.restrictedRead, mid.access.restrictedWrite, mid.access.publicRead) : null;
+ let initialValue = mid.initialValue !== undefined && mid.initialValue !== null ? Model.Values.fromAny(mid.initialValue).orElse(null) : null;
+ return new Model.MetaItemDescriptor(mid.urn, Model.ValueType.fromString(mid.valueType), access, mid.required, mid.pattern, mid.patternFailureMessage, mid.maxPerAttribute, initialValue, mid.valueFixed);
+ });
+ }
+ return new Model.AttributeValueDescriptor(av.name, av.icon, Model.ValueType.fromString(av.valueType), metaItemDescriptors, null);
+ });
+ org.openremote.model.util.AssetModelUtil.setAttributeValueDescriptors(avds);
+ }
+ });
+
// TODO: Implement this in a better way
// Initialise the console
openremote.INSTANCE.console.initialise();
diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
index b22d64da1..3384951f2 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
@@ -21,8 +21,11 @@ package org.openremote.model.asset;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jsinterop.annotations.JsConstructor;
+import jsinterop.annotations.JsType;
import org.openremote.model.attribute.AttributeDescriptor;
+@JsType(namespace = "Model", name = "AssetDescriptor")
public class AssetDescriptorImpl implements AssetDescriptor {
protected String name;
@@ -32,6 +35,7 @@ public class AssetDescriptorImpl implements AssetDescriptor {
AttributeDescriptor[] attributeDescriptors;
@JsonCreator
+ @JsConstructor
public AssetDescriptorImpl(@JsonProperty("name") String name,
@JsonProperty("type") String type,
@JsonProperty("icon") String icon,
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
index 87337d7f0..766dc977a 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptorImpl.java
@@ -21,8 +21,12 @@ package org.openremote.model.attribute;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jsinterop.annotations.JsConstructor;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsType;
import org.openremote.model.value.Value;
+@JsType(namespace = "Model", name = "AttributeDescriptor")
public class AttributeDescriptorImpl implements AttributeDescriptor {
protected String attributeName;
@@ -30,18 +34,18 @@ public class AttributeDescriptorImpl implements AttributeDescriptor {
protected MetaItemDescriptor[] metaItemDescriptors;
protected Value initialValue;
+ @JsIgnore
public AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor) {
- this.attributeName = attributeName;
- this.valueDescriptor = valueDescriptor;
+ this(attributeName, valueDescriptor, null, null);
}
+ @JsIgnore
public AttributeDescriptorImpl(String attributeName, AttributeValueDescriptor valueDescriptor, Value initialValue) {
- this.attributeName = attributeName;
- this.valueDescriptor = valueDescriptor;
- this.initialValue = initialValue;
+ this(attributeName, valueDescriptor, null, initialValue);
}
@JsonCreator
+ @JsConstructor
public AttributeDescriptorImpl(@JsonProperty("attributeName") String attributeName,
@JsonProperty("valueDescriptor") AttributeValueDescriptor valueDescriptor,
@JsonProperty("metaItemDescriptors") MetaItemDescriptor[] metaItemDescriptors,
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptorImpl.java
index 59b766064..d1d9a7c6b 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeValueDescriptorImpl.java
@@ -22,6 +22,10 @@ package org.openremote.model.attribute;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jsinterop.annotations.JsConstructor;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
import org.openremote.model.ValidationFailure;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueType;
@@ -29,6 +33,7 @@ import org.openremote.model.value.ValueType;
import java.util.Optional;
import java.util.function.Function;
+@JsType(namespace = "Model", name = "AttributeValueDescriptor")
public class AttributeValueDescriptorImpl implements AttributeValueDescriptor {
protected String name;
@@ -38,6 +43,7 @@ public class AttributeValueDescriptorImpl implements AttributeValueDescriptor {
@JsonIgnore
protected Function<Value, Optional<ValidationFailure>> validator;
+ @JsIgnore
@JsonCreator
public AttributeValueDescriptorImpl(@JsonProperty("name") String name,
@JsonProperty("icon") String icon,
@@ -46,6 +52,7 @@ public class AttributeValueDescriptorImpl implements AttributeValueDescriptor {
this(name, icon, valueType, metaItemDescriptors, null);
}
+ @JsConstructor
public AttributeValueDescriptorImpl(String name, String icon, ValueType valueType, MetaItemDescriptor[] metaItemDescriptors, Function<Value, Optional<ValidationFailure>> validator) {
this.name = name;
this.icon = icon;
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
index 211a725f9..19e61c29c 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptor.java
@@ -22,6 +22,9 @@ package org.openremote.model.attribute;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jsinterop.annotations.JsConstructor;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsType;
import org.openremote.model.HasUniqueResourceName;
import org.openremote.model.ValidationFailure;
import org.openremote.model.value.Value;
@@ -39,6 +42,7 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
* Control access to meta items when attributes are read/written. The default is
* read/write access by regular and super-users only, meta items are considered private.
*/
+ @JsType(namespace = "Model", name = "MetaItemDescriptorAccess")
class Access {
public static Access ACCESS_PRIVATE = new Access();
@@ -64,10 +68,12 @@ public interface MetaItemDescriptor extends HasUniqueResourceName {
/**
* Private access only.
*/
+ @JsIgnore
public Access() {
this(false, false, false);
}
+ @JsConstructor
public Access(boolean restrictedRead, boolean restrictedWrite, boolean publicRead) {
this.restrictedRead = restrictedRead;
this.restrictedWrite = restrictedWrite;
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
index 54f440581..e6be983cc 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemDescriptorImpl.java
@@ -22,6 +22,10 @@ package org.openremote.model.attribute;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import jsinterop.annotations.JsConstructor;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
import org.openremote.model.ValidationFailure;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueType;
@@ -29,6 +33,7 @@ import org.openremote.model.value.ValueType;
import java.util.Optional;
import java.util.function.Function;
+@JsType(namespace = "Model", name = "MetaItemDescriptor")
public class MetaItemDescriptorImpl implements MetaItemDescriptor {
protected final String urn;
@@ -41,10 +46,34 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
protected final boolean valueFixed;
protected final String patternFailureMessage;
+ @JsConstructor
+ @JsonCreator
+ public MetaItemDescriptorImpl(@JsonProperty("urn") String urn,
+ @JsonProperty("valueType") ValueType valueType,
+ @JsonProperty("access") Access access,
+ @JsonProperty("required") boolean required,
+ @JsonProperty("pattern") String pattern,
+ @JsonProperty("patternFailureMessage") String patternFailureMessage,
+ @JsonProperty("maxPerAttribute") Integer maxPerAttribute,
+ @JsonProperty("initialValue") Value initialValue,
+ @JsonProperty("valueFixed") boolean valueFixed) {
+ this.urn = urn;
+ this.valueType = valueType;
+ this.access = access;
+ this.required = required;
+ this.pattern = pattern;
+ this.patternFailureMessage = patternFailureMessage;
+ this.maxPerAttribute = maxPerAttribute;
+ this.initialValue = initialValue;
+ this.valueFixed = valueFixed;
+ }
+
+ @JsIgnore
public MetaItemDescriptorImpl(MetaItemDescriptor metaItemDescriptor) {
this(metaItemDescriptor, metaItemDescriptor.getInitialValue());
}
+ @JsIgnore
public MetaItemDescriptorImpl(MetaItemDescriptor metaItemDescriptor, Value initialValue) {
this(metaItemDescriptor.getUrn(),
metaItemDescriptor.getValueType(),
@@ -56,6 +85,7 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
metaItemDescriptor.isValueFixed());
}
+ @JsIgnore
public MetaItemDescriptorImpl(String urn,
ValueType valueType,
boolean required,
@@ -67,27 +97,6 @@ public class MetaItemDescriptorImpl implements MetaItemDescriptor {
this(urn, valueType, Access.ACCESS_PRIVATE, required, pattern, patternFailureMessage, maxPerAttribute, initialValue, valueFixed);
}
- @JsonCreator
- public MetaItemDescriptorImpl(@JsonProperty("urn") String urn,
- @JsonProperty("valueType") ValueType valueType,
- @JsonProperty("access") Access access,
- @JsonProperty("required") boolean required,
- @JsonProperty("pattern") String pattern,
- @JsonProperty("patternFailureMessage") String patternFailureMessage,
- @JsonProperty("maxPerAttribute") Integer maxPerAttribute,
- @JsonProperty("initialValue") Value initialValue,
- @JsonProperty("valueFixed") boolean valueFixed) {
- this.urn = urn;
- this.valueType = valueType;
- this.access = access;
- this.required = required;
- this.pattern = pattern;
- this.patternFailureMessage = patternFailureMessage;
- this.maxPerAttribute = maxPerAttribute;
- this.initialValue = initialValue;
- this.valueFixed = valueFixed;
- }
-
@Override
public String getUrn() {
return urn;
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 ce501a6a9..5f1b1b273 100644
--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
@@ -19,6 +19,9 @@
*/
package org.openremote.model.util;
+import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.AssetModelProvider;
import org.openremote.model.attribute.AttributeDescriptor;
@@ -50,6 +53,7 @@ public class AssetModelUtil {
/**
* This should be called by something in the VM at startup to populate the available {@link AssetDescriptor}s.
*/
+ @JsMethod
public static void setAssetDescriptors(AssetDescriptor[] assetDescriptors) {
AssetModelUtil.assetDescriptors = assetDescriptors;
}
@@ -57,6 +61,7 @@ public class AssetModelUtil {
/**
* This should be called by something in the VM at startup to populate the available {@link AttributeDescriptor}s.
*/
+ @JsMethod
public static void setAttributeDescriptors(AttributeDescriptor[] attributeDescriptors) {
AssetModelUtil.attributeDescriptors = attributeDescriptors;
}
@@ -64,6 +69,7 @@ public class AssetModelUtil {
/**
* This should be called by something in the VM at startup to populate the available {@link AttributeValueDescriptor}s.
*/
+ @JsMethod
public static void setAttributeValueDescriptors(AttributeValueDescriptor[] attributeValueDescriptors) {
AssetModelUtil.attributeValueDescriptors = attributeValueDescriptors;
}
@@ -71,22 +77,27 @@ public class AssetModelUtil {
/**
* This should be called by something in the VM at startup to populate the available {@link MetaItemDescriptor}s.
*/
+ @JsMethod
public static void setMetaItemDescriptors(MetaItemDescriptor[] metaItemDescriptors) {
AssetModelUtil.metaItemDescriptors = metaItemDescriptors;
}
+ @JsMethod
public static AssetDescriptor[] getAssetDescriptors() {
return assetDescriptors;
}
+ @JsMethod
public static AttributeDescriptor[] getAttributeDescriptors() {
return attributeDescriptors;
}
+ @JsMethod
public static AttributeValueDescriptor[] getAttributeValueDescriptors() {
return attributeValueDescriptors;
}
+ @JsMethod
public static MetaItemDescriptor[] getMetaItemDescriptors() {
return metaItemDescriptors;
}
diff --git a/model/src/main/java/org/openremote/model/value/Value.java b/model/src/main/java/org/openremote/model/value/Value.java
index 3b1a505d0..eecc45434 100644
--- a/model/src/main/java/org/openremote/model/value/Value.java
+++ b/model/src/main/java/org/openremote/model/value/Value.java
@@ -15,9 +15,7 @@
*/
package org.openremote.model.value;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import jsinterop.base.Any;
-import org.openremote.model.ModelModule;
/**
* Base interface for all values. This is a Java API for a JSON model and instances
diff --git a/model/src/main/java/org/openremote/model/value/ValueType.java b/model/src/main/java/org/openremote/model/value/ValueType.java
index a33251447..37c93868f 100644
--- a/model/src/main/java/org/openremote/model/value/ValueType.java
+++ b/model/src/main/java/org/openremote/model/value/ValueType.java
@@ -15,9 +15,15 @@
*/
package org.openremote.model.value;
+import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsType;
+
+import java.util.Locale;
+
/**
* Represents the type of the underlying value, the same as in JSON.
*/
+@JsType(namespace = "Model", name = "ValueType")
public enum ValueType {
OBJECT(ObjectValue.class),
@@ -46,4 +52,9 @@ public enum ValueType {
throw new IllegalStateException("Failed to get value type from model type");
}
+
+ @JsMethod
+ public static ValueType fromString(String value) {
+ return value == null ? null : valueOf(value.toUpperCase(Locale.ROOT));
+ }
}
diff --git a/model/src/main/java/org/openremote/model/value/Values.java b/model/src/main/java/org/openremote/model/value/Values.java
index 1bcf992fb..6c34d45fa 100644
--- a/model/src/main/java/org/openremote/model/value/Values.java
+++ b/model/src/main/java/org/openremote/model/value/Values.java
@@ -15,9 +15,11 @@
*/
package org.openremote.model.value;
+import jsinterop.annotations.JsMethod;
import jsinterop.base.Any;
import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.attribute.MetaItem;
+import org.openremote.model.util.TextUtil;
import org.openremote.model.value.impl.ValueFactoryImpl;
import java.util.List;
@@ -56,10 +58,20 @@ public class Values {
return ValueFactoryImpl.INSTANCE;
}
+
+ public static Value parseOrNull(String jsonString) {
+ try {
+ return parse(jsonString).orElse(null);
+ }
+ catch (Exception ignored) {}
+ return null;
+ }
+
public static <T extends Value> Optional<T> parse(String jsonString) throws ValueException {
return instance().parse(jsonString);
}
+ @JsMethod(namespace = "Model.Values")
public static native <T extends Value> Optional<T> fromAny(Any any) /*-{
// TODO This makes a copy which is inefficient, need twice the memory. We need a better JSON API to share with Java and JS.
return @org.openremote.model.value.Values::parse(Ljava/lang/String;)(JSON.stringify(any));