Skip to content

armgit / core

Public Imported from GitHub
0

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

Added Jackson formatting for optional Added functions for simple custom AttributeDescriptor

Michael Rademaker5eed9206d005
diff --git a/container/build.gradle b/container/build.gradle
index 965859b62..ca177c7b7 100644
--- a/container/build.gradle
+++ b/container/build.gradle
@@ -17,6 +17,7 @@ dependencies {
compile "com.devskiller.friendly-id:friendly-id:$friendlyIdVersion"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
+ compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"
compile "io.undertow:undertow-servlet:$undertowVersion"
compile "io.undertow:undertow-websockets-jsr:$undertowVersion"
diff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.java
index 06181f8eb..49a51cf44 100644
--- a/container/src/main/java/org/openremote/container/Container.java
+++ b/container/src/main/java/org/openremote/container/Container.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import org.openremote.container.concurrent.ContainerThreads;
import org.openremote.container.json.ModelModule;
import org.openremote.container.util.LogUtil;
@@ -70,7 +71,8 @@ public class Container {
.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY)
- .registerModule(new ModelModule());
+ .registerModule(new ModelModule())
+ .registerModule(new Jdk8Module());
protected final Map<String, String> config = new HashMap<>();
protected final boolean devMode;
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
index da6b26eae..b89a9f7dd 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java
@@ -24,7 +24,7 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.AssetModelResource;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItemDescriptor;
import org.openremote.model.http.RequestParams;
@@ -42,8 +42,8 @@ public class AssetModelResourceImpl extends ManagerWebResource implements AssetM
}
@Override
- public AttributeTypeDescriptor[] getAttributeTypeDescriptors(RequestParams requestParams) {
- return AssetModelUtil.getAttributeTypeDescriptors();
+ public AttributeDescriptor[] getAttributeTypeDescriptors(RequestParams requestParams) {
+ return AssetModelUtil.getAttributeDescriptors();
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
index 844549e51..be35d92c1 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java
@@ -23,7 +23,7 @@ import org.openremote.container.Container;
import org.openremote.container.ContainerService;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.AssetModelProvider;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItemDescriptor;
import org.openremote.model.util.AssetModelUtil;
@@ -51,7 +51,7 @@ public class AssetModelService implements ContainerService {
public void init(Container container) throws Exception {
List<AssetDescriptor> assetDescriptors = new ArrayList<>();
- List<AttributeTypeDescriptor> attributeTypeDescriptors = new ArrayList<>();
+ List<AttributeDescriptor> attributeDescriptors = new ArrayList<>();
List<AttributeValueDescriptor> attributeValueDescriptors = new ArrayList<>();
List<MetaItemDescriptor> metaItemDescriptors = new ArrayList<>();
@@ -59,13 +59,13 @@ public class AssetModelService implements ContainerService {
LOG.fine("Adding asset model descriptors of provider: " + assetModelProvider.getClass().getName());
assetDescriptors.addAll(Arrays.asList(assetModelProvider.getAssetDescriptors()));
- attributeTypeDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeTypeDescriptors()));
+ attributeDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeTypeDescriptors()));
attributeValueDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeValueDescriptors()));
metaItemDescriptors.addAll(Arrays.asList(assetModelProvider.getMetaItemDescriptors()));
});
AssetModelUtil.setAssetDescriptors(assetDescriptors.toArray(new AssetDescriptor[0]));
- AssetModelUtil.setAttributeTypeDescriptors(attributeTypeDescriptors.toArray(new AttributeTypeDescriptor[0]));
+ AssetModelUtil.setAttributeDescriptors(attributeDescriptors.toArray(new AttributeDescriptor[0]));
AssetModelUtil.setAttributeValueDescriptors(attributeValueDescriptors.toArray(new AttributeValueDescriptor[0]));
AssetModelUtil.setMetaItemDescriptors(metaItemDescriptors.toArray(new MetaItemDescriptor[0]));
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index 33eac5785..e6b37b475 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -465,7 +465,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
// Add meta items to well known attributes if not present
newAsset.getAttributesStream().forEach(assetAttribute -> {
- Optional<AttributeTypeDescriptor> attributeDescriptor = assetDescriptor.getAttributeTypeDescriptors()
+ Optional<AttributeDescriptor> attributeDescriptor = assetDescriptor.getAttributeDescriptors()
.flatMap(attributeDescriptors ->
Arrays.stream(attributeDescriptors)
.filter(attrDescriptor -> attrDescriptor.getName().equals(assetAttribute.getNameOrThrow()))
@@ -481,7 +481,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
});
// Add attributes for this well known asset if not present
- assetDescriptor.getAttributeTypeDescriptors().ifPresent(attributeDescriptors ->
+ assetDescriptor.getAttributeDescriptors().ifPresent(attributeDescriptors ->
newAsset.addAttributes(
Arrays.stream(attributeDescriptors).filter(attributeDescriptor ->
!newAsset.hasAttribute(attributeDescriptor.getName())).map(AssetAttribute::new).toArray(AssetAttribute[]::new)
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 ed263d5ca..7b99ffb22 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -26,7 +26,7 @@ import org.openremote.model.AbstractValueHolder;
import org.openremote.model.IdentifiableEntity;
import org.openremote.model.ValidationFailure;
import org.openremote.model.attribute.Attribute;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.geo.GeoJSON;
import org.openremote.model.geo.GeoJSONFeature;
import org.openremote.model.geo.GeoJSONFeatureCollection;
@@ -300,7 +300,7 @@ public class Asset implements IdentifiableEntity {
public Asset(@NotNull String name, @NotNull AssetDescriptor type, Asset parent, String realm) {
this(name, type.getType(), type.getAccessPublicRead(), parent, realm);
- type.getAttributeTypeDescriptors().ifPresent(attributeDescriptors ->
+ type.getAttributeDescriptors().ifPresent(attributeDescriptors ->
addAttributes(Arrays.stream(attributeDescriptors).map(AssetAttribute::new).toArray(AssetAttribute[]::new)));
}
@@ -366,8 +366,8 @@ public class Asset implements IdentifiableEntity {
return this;
}
- public Asset removeAttribute(AttributeTypeDescriptor attributeTypeDescriptor) {
- return removeAttribute(attributeTypeDescriptor.getName());
+ public Asset removeAttribute(AttributeDescriptor attributeDescriptor) {
+ return removeAttribute(attributeDescriptor.getName());
}
public String getId() {
@@ -538,7 +538,7 @@ public class Asset implements IdentifiableEntity {
return attributes != null && attributes.hasKey(name);
}
- public Optional<AssetAttribute> getAttribute(AttributeTypeDescriptor descriptor) {
+ public Optional<AssetAttribute> getAttribute(AttributeDescriptor descriptor) {
return getAttribute(descriptor.getName());
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
index d6e138ede..cd1d2e4b8 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
@@ -58,35 +58,35 @@ public class AssetAttribute extends Attribute {
super(name, type);
}
- public AssetAttribute(AttributeTypeDescriptor attributeTypeDescriptor) {
- this(attributeTypeDescriptor.getName(), attributeTypeDescriptor);
+ public AssetAttribute(AttributeDescriptor attributeDescriptor) {
+ this(attributeDescriptor.getName(), attributeDescriptor);
}
- public AssetAttribute(String name, AttributeTypeDescriptor attributeTypeDescriptor) {
- this(name, attributeTypeDescriptor, attributeTypeDescriptor.getInitialValue());
+ public AssetAttribute(String name, AttributeDescriptor attributeDescriptor) {
+ this(name, attributeDescriptor, attributeDescriptor.getInitialValue());
}
- public AssetAttribute(AttributeTypeDescriptor attributeTypeDescriptor, Value value) {
- this(attributeTypeDescriptor.getName(), attributeTypeDescriptor, value);
+ public AssetAttribute(AttributeDescriptor attributeDescriptor, Value value) {
+ this(attributeDescriptor.getName(), attributeDescriptor, value);
}
- public AssetAttribute(String name, AttributeTypeDescriptor attributeTypeDescriptor, Value value) {
- this(name, attributeTypeDescriptor, value, 0L);
+ public AssetAttribute(String name, AttributeDescriptor attributeDescriptor, Value value) {
+ this(name, attributeDescriptor, value, 0L);
}
- public AssetAttribute(AttributeTypeDescriptor attributeTypeDescriptor, Value value, long timestamp) {
- this(attributeTypeDescriptor.getName(), attributeTypeDescriptor, value, timestamp);
+ public AssetAttribute(AttributeDescriptor attributeDescriptor, Value value, long timestamp) {
+ this(attributeDescriptor.getName(), attributeDescriptor, value, timestamp);
}
- public AssetAttribute(String name, AttributeTypeDescriptor attributeTypeDescriptor, Value value, long timestamp) {
- super(name, attributeTypeDescriptor.getValueDescriptor(), value);
+ public AssetAttribute(String name, AttributeDescriptor attributeDescriptor, Value value, long timestamp) {
+ super(name, attributeDescriptor.getValueDescriptor(), value);
if (value != null) {
- if (value.getType() != attributeTypeDescriptor.getValueDescriptor().getValueType()) {
+ if (value.getType() != attributeDescriptor.getValueDescriptor().getValueType()) {
throw new IllegalArgumentException("Provided value type is not compatible with this attribute type");
}
}
setValue(value, timestamp);
- attributeTypeDescriptor.getMetaItemDescriptors().ifPresent(metaItemDescriptors ->
+ attributeDescriptor.getMetaItemDescriptors().ifPresent(metaItemDescriptors ->
addMeta(Arrays.stream(metaItemDescriptors).map(MetaItem::new).toArray(MetaItem[]::new))
);
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
index 50f4d41c4..83b4c1f8d 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
@@ -21,7 +21,7 @@ package org.openremote.model.asset;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import java.util.Optional;
@@ -37,5 +37,5 @@ public interface AssetDescriptor {
boolean getAccessPublicRead();
- Optional<AttributeTypeDescriptor[]> getAttributeTypeDescriptors();
+ Optional<AttributeDescriptor[]> getAttributeDescriptors();
}
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 63fec11c1..f8d113e5b 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
@@ -19,7 +19,7 @@
*/
package org.openremote.model.asset;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItemDescriptor;
@@ -32,7 +32,7 @@ public interface AssetModelProvider {
AssetDescriptor[] getAssetDescriptors();
- AttributeTypeDescriptor[] getAttributeTypeDescriptors();
+ AttributeDescriptor[] getAttributeTypeDescriptors();
AttributeValueDescriptor[] getAttributeValueDescriptors();
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
index de9032041..c37591764 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java
@@ -21,7 +21,7 @@ package org.openremote.model.asset;
import jsinterop.annotations.JsType;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItemDescriptor;
import org.openremote.model.http.RequestParams;
@@ -47,7 +47,7 @@ public interface AssetModelResource {
AssetDescriptor[] getAssetDescriptors(@BeanParam RequestParams requestParams);
/**
- * Retrieve attribute type descriptors {@link AttributeTypeDescriptor} present.
+ * Retrieve attribute type descriptors {@link AttributeDescriptor} present.
* <p>
*/
@GET
@@ -55,7 +55,7 @@ public interface AssetModelResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- AttributeTypeDescriptor[] getAttributeTypeDescriptors(@BeanParam RequestParams requestParams);
+ AttributeDescriptor[] getAttributeTypeDescriptors(@BeanParam RequestParams requestParams);
/**
* Retrieve attribute type descriptors {@link AttributeValueDescriptor} present.
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.java
index 6720a692f..75c432f10 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -19,7 +19,7 @@
*/
package org.openremote.model.asset;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import java.util.*;
@@ -58,17 +58,17 @@ public enum AssetType implements AssetDescriptor {
final protected String type;
final protected String icon;
final protected boolean accessPublicRead;
- final protected AttributeTypeDescriptor[] attributeTypeDescriptors;
+ final protected AttributeDescriptor[] attributeDescriptors;
- AssetType(String type, String icon, AttributeTypeDescriptor... attributeTypeDescriptors) {
- this(type, icon, false, attributeTypeDescriptors);
+ AssetType(String type, String icon, AttributeDescriptor... attributeDescriptors) {
+ this(type, icon, false, attributeDescriptors);
}
- AssetType(String type, String icon, boolean accessPublicRead, AttributeTypeDescriptor... attributeTypeDescriptors) {
+ AssetType(String type, String icon, boolean accessPublicRead, AttributeDescriptor... attributeDescriptors) {
this.type = type;
this.icon = icon;
this.accessPublicRead = accessPublicRead;
- this.attributeTypeDescriptors = attributeTypeDescriptors;
+ this.attributeDescriptors = attributeDescriptors;
}
public static Optional<AssetType> getByValue(String value) {
@@ -103,7 +103,7 @@ public enum AssetType implements AssetDescriptor {
}
@Override
- public Optional<AttributeTypeDescriptor[]> getAttributeTypeDescriptors() {
- return Optional.ofNullable(attributeTypeDescriptors);
+ public Optional<AttributeDescriptor[]> getAttributeDescriptors() {
+ return Optional.ofNullable(attributeDescriptors);
}
}
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 13e59c16b..8f412ec41 100644
--- a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
@@ -37,7 +37,7 @@ public class DefaultAssetModelProvider implements AssetModelProvider {
}
@Override
- public AttributeTypeDescriptor[] getAttributeTypeDescriptors() {
+ public AttributeDescriptor[] getAttributeTypeDescriptors() {
return AttributeType.values();
}
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeTypeDescriptor.java b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
similarity index 96%
rename from model/src/main/java/org/openremote/model/attribute/AttributeTypeDescriptor.java
rename to model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
index 87d814984..904613e50 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeTypeDescriptor.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeDescriptor.java
@@ -25,7 +25,7 @@ import org.openremote.model.value.Value;
import java.util.Optional;
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
-public interface AttributeTypeDescriptor {
+public interface AttributeDescriptor {
String getName();
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeType.java b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
index b7e5db8f7..7c691c570 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeType.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeType.java
@@ -19,39 +19,44 @@
*/
package org.openremote.model.attribute;
+import com.fasterxml.jackson.annotation.JsonProperty;
import org.openremote.model.value.Value;
import org.openremote.model.value.Values;
import java.util.Optional;
import static org.openremote.model.asset.MetaItemType.*;
-import static org.openremote.model.attribute.AttributeValueType.*;
+import static org.openremote.model.attribute.AttributeValueType.OBJECT;
-public enum AttributeType implements AttributeTypeDescriptor {
+public enum AttributeType implements AttributeDescriptor {
- CONSOLE_NAME("consoleName", STRING),
+ STRING("string", org.openremote.model.attribute.AttributeValueType.STRING),
- CONSOLE_VERSION("consoleVersion", STRING),
+ NUMBER("number", org.openremote.model.attribute.AttributeValueType.NUMBER),
- CONSOLE_PLATFORM("consolePlatform", STRING),
+ CONSOLE_NAME("consoleName", org.openremote.model.attribute.AttributeValueType.STRING),
+
+ CONSOLE_VERSION("consoleVersion", org.openremote.model.attribute.AttributeValueType.STRING),
+
+ CONSOLE_PLATFORM("consolePlatform", org.openremote.model.attribute.AttributeValueType.STRING),
CONSOLE_PROVIDERS("consoleProviders", OBJECT),
EMAIL("email", AttributeValueType.EMAIL, LABEL.withInitialValue(Values.create("Email"))),
- GEO_CITY("city", STRING,
+ GEO_CITY("city", org.openremote.model.attribute.AttributeValueType.STRING,
LABEL.withInitialValue(Values.create("City")),
ABOUT.withInitialValue(Values.create("http://project-haystack.org/tag/geoCity"))),
- GEO_COUNTRY("country", STRING,
+ GEO_COUNTRY("country", org.openremote.model.attribute.AttributeValueType.STRING,
LABEL.withInitialValue(Values.create("Country")),
ABOUT.withInitialValue(Values.create("http://project-haystack.org/tag/geoCountry"))),
- GEO_POSTAL_CODE("postalCode", NUMBER,
+ GEO_POSTAL_CODE("postalCode", org.openremote.model.attribute.AttributeValueType.NUMBER,
LABEL.withInitialValue(Values.create("Postal Code")),
ABOUT.withInitialValue(Values.create("http://project-haystack.org/tag/geoPostalCode"))),
- GEO_STREET("street", STRING,
+ GEO_STREET("street", org.openremote.model.attribute.AttributeValueType.STRING,
LABEL.withInitialValue(Values.create("Street")),
ABOUT.withInitialValue(Values.create("http://project-haystack.org/tag/geoStreet"))),
@@ -59,7 +64,7 @@ public enum AttributeType implements AttributeTypeDescriptor {
SURFACE_AREA(
"surfaceArea",
- NUMBER,
+ org.openremote.model.attribute.AttributeValueType.NUMBER,
LABEL.withInitialValue(Values.create("Surface Area")),
DESCRIPTION.withInitialValue(Values.create("Floor area of building measured in m²")),
ABOUT.withInitialValue(Values.create("http://project-haystack.org/tag/area")));
@@ -80,11 +85,11 @@ public enum AttributeType implements AttributeTypeDescriptor {
this.initialValue = initialValue;
}
- public static Optional<AttributeTypeDescriptor> getByValue(String name) {
+ public static Optional<AttributeDescriptor> getByValue(String name) {
if (name == null)
return Optional.empty();
- for (AttributeTypeDescriptor descriptor : values()) {
+ for (AttributeDescriptor descriptor : values()) {
if (name.equals(descriptor.getName()))
return Optional.of(descriptor);
}
@@ -110,4 +115,37 @@ public enum AttributeType implements AttributeTypeDescriptor {
public Value getInitialValue() {
return initialValue;
}
+
+ public AttributeDescriptor withName(String name, MetaItemDescriptor... metaItemDescriptors) {
+ return withName(name, null, metaItemDescriptors);
+ }
+
+ public AttributeDescriptor withName(String name, Value initialValue, MetaItemDescriptor... metaItemDescriptors) {
+
+ return new AttributeDescriptor() {
+ @Override
+ @JsonProperty
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ @JsonProperty
+ public AttributeValueDescriptor getValueDescriptor() {
+ return attributeValueDescriptor;
+ }
+
+ @Override
+ @JsonProperty
+ public Optional<MetaItemDescriptor[]> getMetaItemDescriptors() {
+ return Optional.ofNullable(metaItemDescriptors);
+ }
+
+ @Override
+ @JsonProperty
+ public Value getInitialValue() {
+ return initialValue;
+ }
+ };
+ }
}
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 22948ac79..fe4179602 100644
--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
@@ -21,7 +21,7 @@ package org.openremote.model.util;
import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.asset.AssetModelProvider;
-import org.openremote.model.attribute.AttributeTypeDescriptor;
+import org.openremote.model.attribute.AttributeDescriptor;
import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.attribute.MetaItem;
import org.openremote.model.attribute.MetaItemDescriptor;
@@ -41,7 +41,7 @@ import static org.openremote.model.util.TextUtil.isNullOrEmpty;
public class AssetModelUtil {
protected static AssetDescriptor[] assetDescriptors = new AssetDescriptor[0];
- protected static AttributeTypeDescriptor[] attributeTypeDescriptors = new AttributeTypeDescriptor[0];
+ protected static AttributeDescriptor[] attributeDescriptors = new AttributeDescriptor[0];
protected static AttributeValueDescriptor[] attributeValueDescriptors = new AttributeValueDescriptor[0];
protected static MetaItemDescriptor[] metaItemDescriptors = new MetaItemDescriptor[0];
@@ -55,10 +55,10 @@ public class AssetModelUtil {
}
/**
- * This should be called by something in the VM at startup to populate the available {@link AttributeTypeDescriptor}s.
+ * This should be called by something in the VM at startup to populate the available {@link AttributeDescriptor}s.
*/
- public static void setAttributeTypeDescriptors(AttributeTypeDescriptor[] attributeTypeDescriptors) {
- AssetModelUtil.attributeTypeDescriptors = attributeTypeDescriptors;
+ public static void setAttributeDescriptors(AttributeDescriptor[] attributeDescriptors) {
+ AssetModelUtil.attributeDescriptors = attributeDescriptors;
}
/**
@@ -79,8 +79,8 @@ public class AssetModelUtil {
return assetDescriptors;
}
- public static AttributeTypeDescriptor[] getAttributeTypeDescriptors() {
- return attributeTypeDescriptors;
+ public static AttributeDescriptor[] getAttributeDescriptors() {
+ return attributeDescriptors;
}
public static AttributeValueDescriptor[] getAttributeValueDescriptors() {
@@ -112,13 +112,13 @@ public class AssetModelUtil {
return Optional.empty();
}
- public static Optional<AttributeTypeDescriptor> getAttributeDescriptor(String name) {
+ public static Optional<AttributeDescriptor> getAttributeDescriptor(String name) {
if (name == null)
return Optional.empty();
- for (AttributeTypeDescriptor attributeTypeDescriptor : attributeTypeDescriptors) {
- if (name.equals(attributeTypeDescriptor.getName()))
- return Optional.of(attributeTypeDescriptor);
+ for (AttributeDescriptor attributeDescriptor : attributeDescriptors) {
+ if (name.equals(attributeDescriptor.getName()))
+ return Optional.of(attributeDescriptor);
}
return Optional.empty();
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index 20985a0b0..202f48168 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -20,20 +20,8 @@
package org.openremote.test.assets
import org.openremote.container.Container
-import org.openremote.container.persistence.PersistenceService
-import org.openremote.manager.asset.AssetStorageService
-import org.openremote.manager.setup.SetupService
-import org.openremote.manager.setup.builtin.KeycloakDemoSetup
-import org.openremote.manager.setup.builtin.ManagerDemoSetup
-import org.openremote.model.asset.Asset
-import org.openremote.model.asset.AssetAttribute
import org.openremote.model.asset.AssetModelResource
-import org.openremote.model.asset.AssetResource
-import org.openremote.model.attribute.MetaItem
-import org.openremote.model.query.AssetQuery
-import org.openremote.model.query.BaseAssetQuery
import org.openremote.model.value.ValueType
-import org.openremote.model.value.Values
import org.openremote.test.ManagerContainerTrait
import spock.lang.Shared
import spock.lang.Specification
@@ -47,9 +35,6 @@ import static org.openremote.model.asset.AssetType.FLOOR
import static org.openremote.model.asset.AssetType.RESIDENCE
import static org.openremote.model.asset.AssetType.ROOM
import static org.openremote.model.asset.AssetType.THING
-import static org.openremote.model.asset.MetaItemType.ACCESS_PUBLIC_READ
-import static org.openremote.model.asset.MetaItemType.LABEL
-import static org.openremote.model.attribute.AttributeValueType.NUMBER
class AssetModelResourceTest extends Specification implements ManagerContainerTrait {
@@ -80,8 +65,8 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
assetDescriptors.size() == 8
assetDescriptors[0].name == CUSTOM.name
assetDescriptors[1].name == BUILDING.name
- assetDescriptors[1].attributeTypeDescriptors.get().length == 4
- assetDescriptors[1].attributeTypeDescriptors.get()[0].valueDescriptor.name == ValueType.STRING
+ assetDescriptors[1].attributeDescriptors.get().length == 4
+ assetDescriptors[1].attributeDescriptors.get()[0].valueDescriptor.name == ValueType.STRING
assetDescriptors[2].name == FLOOR.name
assetDescriptors[3].name == RESIDENCE.name
assetDescriptors[4].name == ROOM.name