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
Introduced AgentDescriptor beginning process of aligning assets and protocols
Rich Turnera9372ddf16d1
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentConnector.java b/manager/src/main/java/org/openremote/manager/agent/AgentConnector.javaindex 57d9708e1..60fc494bf 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentConnector.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentConnector.java@@ -34,6 +34,8 @@ import java.util.List;* This is an interface for communicating with an agent. It* should be stateless and re-usable.*/+// TODO: Remove this as replaced by the gateway service+@Deprecatedpublic interface AgentConnector {List<AgentStatusEvent> getConnectionStatus(Asset agent);diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 3d3f2f9c1..eb58ef0fd 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -33,27 +33,21 @@ import org.openremote.container.ContainerService;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.persistence.PersistenceEvent;import org.openremote.container.timer.TimerService;-import org.openremote.manager.asset.AssetProcessingException;-import org.openremote.manager.asset.AssetProcessingService;-import org.openremote.manager.asset.AssetStorageService;-import org.openremote.manager.asset.AssetUpdateProcessor;+import org.openremote.manager.asset.*;import org.openremote.manager.event.ClientEventService;import org.openremote.manager.gateway.GatewayService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;-import org.openremote.model.asset.Asset;-import org.openremote.model.asset.AssetAttribute;-import org.openremote.model.asset.AssetType;+import org.openremote.model.asset.*;import org.openremote.model.asset.agent.*;-import org.openremote.model.attribute.AttributeEvent;+import org.openremote.model.attribute.*;import org.openremote.model.attribute.AttributeEvent.Source;-import org.openremote.model.attribute.AttributeRef;-import org.openremote.model.attribute.MetaItemType;import org.openremote.model.event.shared.TenantFilter;import org.openremote.model.query.AssetQuery;import org.openremote.model.query.filter.PathPredicate;import org.openremote.model.query.filter.RefPredicate;import org.openremote.model.security.ClientRole;+import org.openremote.model.util.EnumUtil;import org.openremote.model.util.Pair;import org.openremote.model.util.TextUtil;import org.openremote.model.value.*;@@ -91,7 +85,7 @@ import static org.openremote.model.util.TextUtil.isValidURN;* <p>* Finds all {@link AssetType#AGENT} assets and manages their {@link ProtocolConfiguration}s.*/-public class AgentService extends RouteBuilder implements ContainerService, AssetUpdateProcessor, ProtocolAssetService {+public class AgentService extends RouteBuilder implements ContainerService, AssetUpdateProcessor, ProtocolAssetService, AssetModelProvider {private static final Logger LOG = Logger.getLogger(AgentService.class.getName());public static final int PRIORITY = DEFAULT_PRIORITY + 100; // Start quite late to ensure protocols etc. are initialised@@ -110,6 +104,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asseprotected Map<String, Asset> agentMap;protected ParseContext jsonPathParser;protected boolean initDone;+ protected Container container;/*** It's important that {@link Protocol}s have a lower priority than this service so they are fully initialized@@ -122,6 +117,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse@Overridepublic void init(Container container) throws Exception {+ this.container = container;timerService = container.getService(TimerService.class);identityService = container.getService(ManagerIdentityService.class);assetProcessingService = container.getService(AssetProcessingService.class);@@ -131,6 +127,9 @@ public class AgentService extends RouteBuilder implements ContainerService, AssegatewayService = container.getService(GatewayService.class);localAgentConnector = new LocalAgentConnector(this);+ // Register this service as an asset model provider+ container.getService(AssetModelService.class).addAssetModelProvider(this);+if (initDone) {return;}@@ -1073,4 +1072,56 @@ public class AgentService extends RouteBuilder implements ContainerService, Assereturn Values.parse(pathJson).orElse(null);}++ @Override+ public MetaItemDescriptor[] getMetaItemDescriptors() {+ return new MetaItemDescriptor[0];+ }++ @Override+ public AssetDescriptor[] getAssetDescriptors() {+ return new AssetDescriptor[0];+ }++ // TODO: Update once protocol model changes complete+ @Override+ public AgentDescriptor[] getAgentDescriptors() {+ return container.getServices(Protocol.class).stream().map((protocol) -> {+ ProtocolDescriptor pd = protocol.getProtocolDescriptor();++ // Translate meta item descriptors into asset descriptors+ AttributeDescriptor[] attributeDescriptors = pd.getProtocolConfigurationMetaItems().stream()+ .map((descriptor) -> {+ AttributeValueDescriptor valueDescriptor = EnumUtil.enumFromString(AttributeValueType.class, descriptor.getValueType().name()).orElse(AttributeValueType.OBJECT);++ return new AttributeDescriptorImpl(+ descriptor.getUrn(),+ valueDescriptor,+ descriptor.getInitialValue()+ );+ }).toArray(AttributeDescriptor[]::new);++ return new AgentDescriptorImpl(+ pd.getDisplayName(),+ pd.getName(),+ "cogs",+ null,+ attributeDescriptors)+ .setInstanceDiscovery(pd.isConfigurationDiscovery())+ .setInstanceImport(pd.isConfigurationImport())+ .setAssetDiscovery(pd.isDeviceDiscovery())+ .setAssetImport(pd.isDeviceImport());++ }).toArray(AgentDescriptor[]::new);+ }++ @Override+ public AttributeDescriptor[] getAttributeDescriptors() {+ return new AttributeDescriptor[0];+ }++ @Override+ public AttributeValueDescriptor[] getAttributeValueDescriptors() {+ return new AttributeValueDescriptor[0];+ }}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.javaindex 50593fcd9..5fef080fd 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelResourceImpl.java@@ -24,6 +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.asset.agent.AgentDescriptor;import org.openremote.model.attribute.AttributeDescriptor;import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.MetaItemDescriptor;@@ -41,6 +42,11 @@ public class AssetModelResourceImpl extends ManagerWebResource implements AssetMreturn AssetModelUtil.getAssetDescriptors();}+ @Override+ public AgentDescriptor[] getAgentDescriptors(RequestParams requestParams) {+ return AssetModelUtil.getAgentDescriptors();+ }+@Overridepublic AttributeDescriptor[] getAttributeDescriptors(RequestParams requestParams) {return AssetModelUtil.getAttributeDescriptors();diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.javaindex 9fdd5894c..3d13cf641 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java@@ -23,6 +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.asset.agent.AgentDescriptor;import org.openremote.model.attribute.AttributeDescriptor;import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.MetaItemDescriptor;@@ -41,6 +42,7 @@ import java.util.logging.Logger;public class AssetModelService implements ContainerService {private static final Logger LOG = Logger.getLogger(AssetModelService.class.getName());+ protected final List<AssetModelProvider> assetModelProviders = new ArrayList<>();@Overridepublic int getPriority() {@@ -49,21 +51,29 @@ public class AssetModelService implements ContainerService {@Overridepublic void init(Container container) throws Exception {+ ServiceLoader.load(AssetModelProvider.class).forEach(assetModelProviders::add);+ }++ @Override+ public void start(Container container) throws Exception {+ List<AgentDescriptor> agentDescriptors = new ArrayList<>();List<AssetDescriptor> assetDescriptors = new ArrayList<>();List<AttributeDescriptor> attributeDescriptors = new ArrayList<>();List<AttributeValueDescriptor> attributeValueDescriptors = new ArrayList<>();List<MetaItemDescriptor> metaItemDescriptors = new ArrayList<>();- ServiceLoader.load(AssetModelProvider.class).forEach(assetModelProvider -> {+ assetModelProviders.forEach(assetModelProvider -> {LOG.fine("Adding asset model descriptors of provider: " + assetModelProvider.getClass().getName());+ agentDescriptors.addAll(Arrays.asList(assetModelProvider.getAgentDescriptors()));assetDescriptors.addAll(Arrays.asList(assetModelProvider.getAssetDescriptors()));attributeDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeDescriptors()));attributeValueDescriptors.addAll(Arrays.asList(assetModelProvider.getAttributeValueDescriptors()));metaItemDescriptors.addAll(Arrays.asList(assetModelProvider.getMetaItemDescriptors()));});+ AssetModelUtil.setAgentDescriptors(agentDescriptors.toArray(new AgentDescriptor[0]));AssetModelUtil.setAssetDescriptors(assetDescriptors.toArray(new AssetDescriptor[0]));AssetModelUtil.setAttributeDescriptors(attributeDescriptors.toArray(new AttributeDescriptor[0]));AssetModelUtil.setAttributeValueDescriptors(attributeValueDescriptors.toArray(new AttributeValueDescriptor[0]));@@ -71,10 +81,13 @@ public class AssetModelService implements ContainerService {}@Override- public void start(Container container) throws Exception {+ public void stop(Container container) throws Exception {}- @Override- public void stop(Container container) throws Exception {+ public void addAssetModelProvider(AssetModelProvider assetModelProvider) {+ // Model providers should be singletons so make sure no duplicate instances of the same class+ if (assetModelProviders.stream().noneMatch(asm -> asm.getClass() == assetModelProvider.getClass())) {+ this.assetModelProviders.add(assetModelProvider);+ }}}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex a8fc4e845..b251a8c2e 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -466,8 +466,6 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourAssetModelUtil.getAssetDescriptor(asset.getType()).ifPresent(assetDescriptor -> {- newAsset.setAccessPublicRead(assetDescriptor.getAccessPublicRead());-// Add meta items to well known attributes if not presentnewAsset.getAttributesStream().forEach(assetAttribute -> {if (assetDescriptor.getAttributeDescriptors() != null) {diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 4e9196966..bb8003362 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -301,7 +301,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);+ this(name, type.getType(), false, parent, realm);if (type.getAttributeDescriptors() != null) {addAttributes(Arrays.stream(type.getAttributeDescriptors()).map(AssetAttribute::new).toArray(AssetAttribute[]::new));}@@ -708,4 +708,4 @@ public class Asset implements IdentifiableEntity {return asset;}-}\ No newline at end of file+}diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.javaindex 701aa8844..0a473f8e5 100644--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java@@ -50,9 +50,6 @@ public interface AssetDescriptor {@JsonPropertyString getColor();- @JsonProperty- boolean getAccessPublicRead();-@JsonPropertyAttributeDescriptor[] getAttributeDescriptors();diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.javaindex 623d46fc4..fd3fb1a2a 100644--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java@@ -32,7 +32,6 @@ public class AssetDescriptorImpl implements AssetDescriptor {protected String type;protected String icon;protected String color;- protected boolean accessPublicRead;AttributeDescriptor[] attributeDescriptors;@JsonCreator@@ -41,13 +40,11 @@ public class AssetDescriptorImpl implements AssetDescriptor {@JsonProperty("type") String type,@JsonProperty("icon") String icon,@JsonProperty("color") String color,- @JsonProperty("accessPublicRead") boolean accessPublicRead,@JsonProperty("attributeDescriptors") AttributeDescriptor[] attributeDescriptors) {this.name = name;this.type = type;this.icon = icon;this.color = color;- this.accessPublicRead = accessPublicRead;this.attributeDescriptors = attributeDescriptors;}@@ -71,10 +68,6 @@ public class AssetDescriptorImpl implements AssetDescriptor {return null;}- public boolean getAccessPublicRead() {- return accessPublicRead;- }-@Overridepublic AttributeDescriptor[] getAttributeDescriptors() {return attributeDescriptors;diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.javaindex 3bc760b0b..735e50cb2 100644--- a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java+++ b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java@@ -19,6 +19,7 @@*/package org.openremote.model.asset;+import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.attribute.AttributeDescriptor;import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.MetaItemDescriptor;@@ -32,6 +33,8 @@ public interface AssetModelProvider {AssetDescriptor[] getAssetDescriptors();+ AgentDescriptor[] getAgentDescriptors();+AttributeDescriptor[] getAttributeDescriptors();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.javaindex ae89c7313..54f354bf6 100644--- a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java@@ -19,8 +19,8 @@*/package org.openremote.model.asset;-import jsinterop.annotations.JsType;+import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.attribute.AttributeDescriptor;import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.MetaItemDescriptor;@@ -46,6 +46,13 @@ public interface AssetModelResource {@SuppressWarnings("unusable-by-js")AssetDescriptor[] getAssetDescriptors(@BeanParam RequestParams requestParams);+ @GET+ @Path("agent/descriptors")+ @Produces(APPLICATION_JSON)+ @SuccessStatusCode(200)+ @SuppressWarnings("unusable-by-js")+ AgentDescriptor[] getAgentDescriptors(@BeanParam RequestParams requestParams);+/*** Retrieve attribute type descriptors {@link AttributeDescriptor} present.* <p>diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 87d381d2d..9e56c313e 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -315,7 +315,7 @@ public enum AssetType implements AssetDescriptor {)),- PEOPLE_COUNTER(ASSET_NAMESPACE + ":peopleCounter", "account-multiple", "4b5966", false,+ PEOPLE_COUNTER(ASSET_NAMESPACE + ":peopleCounter", "account-multiple", "4b5966",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),@@ -400,7 +400,7 @@ public enum AssetType implements AssetDescriptor {THING(ASSET_NAMESPACE + ":thing", "cube-outline", null),- ELECTRICITY_CONSUMER(ASSET_NAMESPACE + ":electricityConsumer", "power-plug", "8A293D", false,+ ELECTRICITY_CONSUMER(ASSET_NAMESPACE + ":electricityConsumer", "power-plug", "8A293D",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),new AttributeDescriptorImpl("model", STRING, null,@@ -465,7 +465,7 @@ public enum AssetType implements AssetDescriptor {RULE_STATE)),- ELECTRICITY_CHARGER(ASSET_NAMESPACE + ":electricityCharger", "ev-station", "8A293D", false,+ ELECTRICITY_CHARGER(ASSET_NAMESPACE + ":electricityCharger", "ev-station", "8A293D",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),new AttributeDescriptorImpl("model", STRING, null,@@ -513,7 +513,7 @@ public enum AssetType implements AssetDescriptor {UNIT_TYPE.withInitialValue(UNITS_EUR_PER_KILOWATT_HOUR))),- ELECTRICITY_PRODUCER(ASSET_NAMESPACE + ":electricityProducer", "white-balance-sunny", "CC9423", false,+ ELECTRICITY_PRODUCER(ASSET_NAMESPACE + ":electricityProducer", "white-balance-sunny", "CC9423",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),new AttributeDescriptorImpl("model", STRING, null,@@ -550,7 +550,7 @@ public enum AssetType implements AssetDescriptor {)),- ELECTRICITY_STORAGE(ASSET_NAMESPACE + ":electricityStorage", "battery-charging", "1B7C89", false,+ ELECTRICITY_STORAGE(ASSET_NAMESPACE + ":electricityStorage", "battery-charging", "1B7C89",new AttributeDescriptorImpl("manufacturer", STRING, null,LABEL.withInitialValue("Manufacturer")),new AttributeDescriptorImpl("model", STRING, null,@@ -620,7 +620,7 @@ public enum AssetType implements AssetDescriptor {READ_ONLY)),- ELECTRICITY_SUPPLIER(ASSET_NAMESPACE + ":electricitySupplier", "upload-network", "9257A9", false,+ ELECTRICITY_SUPPLIER(ASSET_NAMESPACE + ":electricitySupplier", "upload-network", "9257A9",new AttributeDescriptorImpl("utilityProviderName", STRING, null,LABEL.withInitialValue("Provider name")),new AttributeDescriptorImpl("gridOperatorName", STRING, null,@@ -702,7 +702,7 @@ public enum AssetType implements AssetDescriptor {READ_ONLY)),- WEATHER(ASSET_NAMESPACE + ":weather", "weather-partly-cloudy", "49B0D8", false,+ WEATHER(ASSET_NAMESPACE + ":weather", "weather-partly-cloudy", "49B0D8",new AttributeDescriptorImpl("userNotes", STRING, null,LABEL.withInitialValue("User notes")),new AttributeDescriptorImpl("temperature", TEMPERATURE, null,@@ -764,18 +764,12 @@ public enum AssetType implements AssetDescriptor {final protected String type;final protected String icon;final protected String color;- final protected boolean accessPublicRead;final protected AttributeDescriptor[] attributeDescriptors;AssetType(String type, String icon, String color, AttributeDescriptor... attributeDescriptors) {- this(type, icon, color, false, attributeDescriptors);- }-- AssetType(String type, String icon, String color, boolean accessPublicRead, AttributeDescriptor... attributeDescriptors) {this.type = type;this.icon = icon;this.color = color;- this.accessPublicRead = accessPublicRead;this.attributeDescriptors = attributeDescriptors;}@@ -810,11 +804,6 @@ public enum AssetType implements AssetDescriptor {return color;}- @Override- public boolean getAccessPublicRead() {- return accessPublicRead;- }-@Overridepublic AttributeDescriptor[] getAttributeDescriptors() {return attributeDescriptors;diff --git a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.javaindex 4cd0107fe..9113d6e37 100644--- a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java+++ b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java@@ -19,6 +19,7 @@*/package org.openremote.model.asset;+import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.attribute.*;/**@@ -26,6 +27,11 @@ import org.openremote.model.attribute.*;*/public class DefaultAssetModelProvider implements AssetModelProvider {+ @Override+ public AgentDescriptor[] getAgentDescriptors() {+ return new AgentDescriptor[0];+ }+@Overridepublic MetaItemDescriptor[] getMetaItemDescriptors() {return MetaItemType.values();diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.javanew file mode 100644index 000000000..5a06cf5d0--- /dev/null+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java@@ -0,0 +1,32 @@+/*+ * Copyright 2020, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.model.asset.agent;++import org.openremote.model.asset.AssetDescriptor;++public interface AgentDescriptor extends AssetDescriptor {+ boolean hasInstanceDiscovery();++ boolean hasAssetDiscovery();++ boolean hasInstanceImport();++ boolean hasAssetImport();+}diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.javanew file mode 100644index 000000000..c1539ea87--- /dev/null+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptorImpl.java@@ -0,0 +1,75 @@+/*+ * Copyright 2020, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.model.asset.agent;++import org.openremote.model.asset.AssetDescriptorImpl;+import org.openremote.model.attribute.AttributeDescriptor;++public class AgentDescriptorImpl extends AssetDescriptorImpl implements AgentDescriptor {++ protected boolean instanceDiscovery;+ protected boolean instanceImport;+ protected boolean assetDiscovery;+ protected boolean assetImport;++ public AgentDescriptorImpl(String name, String type, String icon, String color, AttributeDescriptor[] attributeDescriptors) {+ super(name, type, icon, color, attributeDescriptors);+ }++ @Override+ public boolean hasInstanceDiscovery() {+ return instanceDiscovery;+ }++ public AgentDescriptorImpl setInstanceDiscovery(boolean instanceDiscovery) {+ this.instanceDiscovery = instanceDiscovery;+ return this;+ }++ @Override+ public boolean hasInstanceImport() {+ return false;+ }++ public AgentDescriptorImpl setInstanceImport(boolean instanceImport) {+ this.instanceImport = instanceImport;+ return this;+ }++ @Override+ public boolean hasAssetDiscovery() {+ return false;+ }++ public AgentDescriptorImpl setAssetDiscovery(boolean assetDiscovery) {+ this.assetDiscovery = assetDiscovery;+ return this;+ }++ @Override+ public boolean hasAssetImport() {+ return false;+ }++ public AgentDescriptorImpl setAssetImport(boolean assetImport) {+ this.assetImport = assetImport;+ return this;+ }+}diff --git a/model/src/main/java/org/openremote/model/asset/agent/ProtocolDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/ProtocolDescriptor.javaindex bd101750b..963a7b481 100644--- a/model/src/main/java/org/openremote/model/asset/agent/ProtocolDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/agent/ProtocolDescriptor.java@@ -27,6 +27,8 @@ import org.openremote.model.attribute.MetaItemDescriptor;import java.util.List;+// TODO: Remove this in favour of AgentDescriptor+@Deprecatedpublic class ProtocolDescriptor {protected String name;diff --git a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java b/model/src/main/java/org/openremote/model/util/AssetModelUtil.javaindex 5f056a2db..27b385fc2 100644--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java@@ -20,10 +20,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.asset.agent.AgentDescriptor;import org.openremote.model.attribute.AttributeDescriptor;import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.MetaItem;@@ -41,8 +40,11 @@ import static org.openremote.model.util.TextUtil.isNullOrEmpty;* use the {@link org.openremote.model.asset.AssetModelResource} endpoint to get this information and set it once* at start up.*/+// TODO: Move this into the AssetModelService once GWT removed+@Deprecatedpublic class AssetModelUtil {+ protected static AgentDescriptor[] agentDescriptors = new AgentDescriptor[0];protected static AssetDescriptor[] assetDescriptors = new AssetDescriptor[0];protected static AttributeDescriptor[] attributeDescriptors = new AttributeDescriptor[0];protected static AttributeValueDescriptor[] attributeValueDescriptors = new AttributeValueDescriptor[0];@@ -50,6 +52,14 @@ public class AssetModelUtil {private AssetModelUtil() {}+ /**+ * This should be called by something in the VM at startup to populate the available {@link AgentDescriptor}s.+ */+ @JsMethod+ public static void setAgentDescriptors(AgentDescriptor[] agentDescriptors) {+ AssetModelUtil.agentDescriptors = agentDescriptors;+ }+/*** This should be called by something in the VM at startup to populate the available {@link AssetDescriptor}s.*/@@ -87,6 +97,11 @@ public class AssetModelUtil {return assetDescriptors;}+ @JsMethod+ public static AgentDescriptor[] getAgentDescriptors() {+ return agentDescriptors;+ }+@JsMethodpublic static AttributeDescriptor[] getAttributeDescriptors() {return attributeDescriptors;diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 7e93728e7..7aab062f4 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -755,6 +755,7 @@ export class Manager implements EventProviderFactory {}try {+ const agentDescriptorResponse = await rest.api.AssetModelResource.getAgentDescriptors();const assetDescriptorResponse = await rest.api.AssetModelResource.getAssetDescriptors();const attributeDescriptorResponse = await rest.api.AssetModelResource.getAttributeDescriptors();const attributeValueDescriptorResponse = await rest.api.AssetModelResource.getAttributeValueDescriptors();