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
Removed AssetType#CUSTOM (this is not technically an asset type but a UI fallback)
Rich Turnerdf87603959db
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.javaindex 3e7d984ed..12319bf0d 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java@@ -64,7 +64,6 @@ import java.util.logging.Logger;import java.util.stream.Collectors;import static org.openremote.model.asset.AssetAttribute.attributesFromJson;-import static org.openremote.model.asset.AssetType.CUSTOM;import static org.openremote.model.attribute.Attribute.ATTRIBUTE_NAME_VALIDATOR;import static org.openremote.model.attribute.Attribute.isAttributeNameEqualTo;import static org.openremote.model.attribute.MetaItem.isMetaNameEqualTo;@@ -618,11 +617,6 @@ public class AssetEditActivity//TODO replace with AssetModel getValuesSorted, through a http requestList<AssetDescriptor> list = new ArrayList<>(Arrays.asList(AssetType.values()));list.sort(Comparator.comparing(AssetDescriptor::getName));- if (list.contains(CUSTOM)) {- // CUSTOM should be first- list.remove(CUSTOM);- list.add(0, CUSTOM);- }view.setAvailableWellKnownTypes(list.toArray(new AssetDescriptor[list.size()]));view.setType(asset.getType());view.setTypeEditable(isNullOrEmpty(assetId));@@ -708,9 +702,6 @@ public class AssetEditActivity} else {asset.setParentId(null);}- if (CUSTOM.equals(asset.getWellKnownType())) {- asset.setType(view.getType());- }if (selectedCoordinates != null) {asset.setCoordinates(selectedCoordinates);}diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.javaindex 7f7293b35..6e5efd6ff 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java@@ -201,9 +201,7 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {new AbstractRenderer<AssetDescriptor>() {@Overridepublic String render(AssetDescriptor assetType) {- if (assetType == null)- assetType = AssetType.CUSTOM;- return environment.getMessages().assetTypeLabel(assetType.getName());+ return assetType != null ? environment.getMessages().assetTypeLabel(assetType.getName()) : "";}});@@ -435,7 +433,7 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {@Overridepublic void selectWellKnownType(AssetDescriptor assetType) {typeListBox.setValue(assetType);- typeInput.setVisible(assetType == AssetType.CUSTOM);+ typeInput.setVisible(assetType != null);}@Override@@ -447,8 +445,8 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {public void setType(String type) {typeInput.setValue(type);//TODO replace with AssetModel getValues, through a http request- AssetDescriptor assetType = AssetType.getByValue(type).orElse(AssetType.CUSTOM);- if (assetType == AssetType.CUSTOM) {+ AssetDescriptor assetType = AssetType.getByValue(type).orElse(null);+ if (assetType == null) {headline.setSub(type);} else {headline.setSub(managerMessages.assetTypeLabel(assetType.getName()));@@ -460,7 +458,7 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {typeGroup.setVisible(editable);typeListBox.setEnabled(editable);typeInput.setReadOnly(!editable);- customTypeInfoLabel.setVisible(editable && typeListBox.getValue() == AssetType.CUSTOM);+ customTypeInfoLabel.setVisible(editable && typeListBox.getValue() == null);}@Overridediff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.javaindex da8fe53bb..20da4ecbd 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java@@ -263,7 +263,9 @@ public class AssetViewActivity@Overridepublic void writeAssetToView() {super.writeAssetToView();- view.setIconAndType(asset.getWellKnownType().getIcon(), asset.getType());+ AssetType assetType = asset.getWellKnownType();++ view.setIconAndType(assetType != null ? assetType.getIcon() : "cube", asset.getType());// Build the link manually, shorter result than AssetQueryMapper, and we must hardcode the path anywayString query = Values.createObject()diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.javaindex ce08e6dff..c55a78a6f 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java@@ -371,8 +371,8 @@ public class AssetViewImpl extends Composite implements AssetView {public void setIconAndType(String icon, String type) {headline.setIcon(icon);//TODO replace with AssetModel getValues, through a http request- AssetType assetType = AssetType.getByValue(type).orElse(AssetType.CUSTOM);- if (assetType == AssetType.CUSTOM) {+ AssetType assetType = AssetType.getByValue(type).orElse(null);+ if (assetType == null) {headline.setSub(type);} else {headline.setSub(managerMessages.assetTypeLabel(assetType.name()));diff --git a/client/src/main/java/org/openremote/app/client/assets/browser/AssetTreeNode.java b/client/src/main/java/org/openremote/app/client/assets/browser/AssetTreeNode.javaindex faf30ddd6..cd20912f7 100644--- a/client/src/main/java/org/openremote/app/client/assets/browser/AssetTreeNode.java+++ b/client/src/main/java/org/openremote/app/client/assets/browser/AssetTreeNode.java@@ -20,6 +20,7 @@package org.openremote.app.client.assets.browser;import org.openremote.model.asset.Asset;+import org.openremote.model.asset.AssetType;public class AssetTreeNode extends BrowserTreeNode {@@ -48,6 +49,11 @@ public class AssetTreeNode extends BrowserTreeNode {@Overridepublic String getIcon() {- return asset.getWellKnownType().getIcon();+ AssetType assetType = asset.getWellKnownType();+ if (assetType != null) {+ return assetType.getIcon();+ }++ return "cube";}}diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex dd479952d..0caa29bdd 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -428,7 +428,7 @@ public class Asset implements IdentifiableEntity {public AssetType getWellKnownType() {//TODO replace with AssetModel getValues, through a http request- return AssetType.getByValue(getType()).orElse(AssetType.CUSTOM);+ return AssetType.getByValue(getType()).orElse(null);}public void setType(String type) throws IllegalArgumentException {@@ -491,7 +491,7 @@ public class Asset implements IdentifiableEntity {public AssetType getParentWellKnownType() {//TODO replace with AssetModel getValues, through a http request- return AssetType.getByValue(getParentType()).orElse(AssetType.CUSTOM);+ return AssetType.getByValue(getParentType()).orElse(null);}public String getRealm() {diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 139ba0e4f..4a4c93cb8 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -34,8 +34,6 @@ import static org.openremote.model.attribute.AttributeType.*;*/public enum AssetType implements AssetDescriptor {- CUSTOM(null, "cube", null),-BUILDING(ASSET_NAMESPACE + ":building", "office-building", null,SURFACE_AREA,GEO_STREET,diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovyindex 6928844f6..433e084c6 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy@@ -32,7 +32,6 @@ import static org.openremote.model.Constants.MASTER_REALMimport static org.openremote.model.asset.AssetType.AGENTimport static org.openremote.model.asset.AssetType.BUILDINGimport static org.openremote.model.asset.AssetType.CONSOLE-import static org.openremote.model.asset.AssetType.CUSTOMimport static org.openremote.model.asset.AssetType.FLOORimport static org.openremote.model.asset.AssetType.RESIDENCEimport static org.openremote.model.asset.AssetType.ROOM@@ -64,17 +63,16 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTrdef assetDescriptors = assetModelResource.getAssetDescriptors(null)then: "the default asset types should be present"- assetDescriptors.size() == 8- assetDescriptors[0].name == CUSTOM.name- assetDescriptors[1].name == BUILDING.name- assetDescriptors[1].attributeDescriptors.length == 5- assetDescriptors[1].attributeDescriptors.find {it.attributeName == AttributeType.SURFACE_AREA.attributeName}.valueDescriptor.valueType == ValueType.NUMBER- assetDescriptors[2].name == FLOOR.name- assetDescriptors[3].name == RESIDENCE.name- assetDescriptors[4].name == ROOM.name- assetDescriptors[5].name == AGENT.name- assetDescriptors[6].name == CONSOLE.name- assetDescriptors[7].name == THING.name+ assetDescriptors.size() == 7+ assetDescriptors[0].name == BUILDING.name+ assetDescriptors[0].attributeDescriptors.length == 5+ assetDescriptors[0].attributeDescriptors.find {it.attributeName == AttributeType.SURFACE_AREA.attributeName}.valueDescriptor.valueType == ValueType.NUMBER+ assetDescriptors[1].name == FLOOR.name+ assetDescriptors[2].name == RESIDENCE.name+ assetDescriptors[3].name == ROOM.name+ assetDescriptors[4].name == AGENT.name+ assetDescriptors[5].name == CONSOLE.name+ assetDescriptors[6].name == THING.namewhen: "a request for Attribute types is made"