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
DoorSensorAsset renamed to DoorAsset
Rich Turner794bf2d74c05
diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/ProtocolIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/ProtocolIOClient.javaindex c87bea467..eecc9a8d0 100644--- a/agent/src/main/java/org/openremote/agent/protocol/io/ProtocolIOClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/io/ProtocolIOClient.java@@ -51,14 +51,14 @@ public class ProtocolIOClient<W, X extends IOClient<W>> {ioClient.connect();}- protected void disconnect() {+ public void disconnect() {ioClient.removeAllMessageConsumers();ioClient.removeAllConnectionStatusConsumers();AbstractIOClientProtocol.LOG.info("Disconnecting IO client");ioClient.disconnect();}- protected synchronized void send(W message) {+ public synchronized void send(W message) {AbstractIOClientProtocol.LOG.fine("Sending message to IO client: " + ioClient.getClientUri());ioClient.sendMessage(message);}diff --git a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.javasimilarity index 54%rename from model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.javarename to model/src/main/java/org/openremote/model/asset/impl/DoorAsset.javaindex 433c571e6..e706ab001 100644--- a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.java@@ -21,38 +21,55 @@ package org.openremote.model.asset.impl;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.attribute.AttributeExecuteStatus;import org.openremote.model.attribute.MetaItem;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;+import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;import javax.persistence.Entity;import java.util.Optional;@Entity-public class DoorSensorAsset extends Asset<DoorSensorAsset> {+public class DoorAsset extends Asset<DoorAsset> {- public static final AttributeDescriptor<Boolean> OPEN = new AttributeDescriptor<>("open", ValueType.BOOLEAN,- new MetaItem<>(MetaItemType.READ_ONLY));- public static final AttributeDescriptor<Boolean> LOCKED = new AttributeDescriptor<>("locked", ValueType.BOOLEAN);+ public static final AttributeDescriptor<Boolean> POSITION = new AttributeDescriptor<>("position", ValueType.BOOLEAN,+ new MetaItem<>(MetaItemType.READ_ONLY)+ ).withFormat(ValueFormat.BOOLEAN_AS_OPEN_CLOSED());- public static final AssetDescriptor<DoorSensorAsset> DESCRIPTOR = new AssetDescriptor<>("door", "ae2eb6", DoorSensorAsset.class);+ public static final AttributeDescriptor<Boolean> LOCKED = new AttributeDescriptor<>("locked", ValueType.BOOLEAN,+ new MetaItem<>(MetaItemType.READ_ONLY)+ ).withOptional(true);++ public static final AttributeDescriptor<String> LAST_ACCESS = new AttributeDescriptor<>("lastAccess", ValueType.TEXT,+ new MetaItem<>(MetaItemType.READ_ONLY)+ ).withOptional(true);++ public static final AttributeDescriptor<AttributeExecuteStatus> UNLOCK = new AttributeDescriptor<>("unlock", ValueType.EXECUTION_STATUS)+ .withOptional(true);++ public static final AssetDescriptor<DoorAsset> DESCRIPTOR = new AssetDescriptor<>("door", "ae2eb6", DoorAsset.class);/*** For use by hydrators (i.e. JPA/Jackson)*/- protected DoorSensorAsset() {+ protected DoorAsset() {}- public DoorSensorAsset(String name) {+ public DoorAsset(String name) {super(name);}- public Optional<Boolean> getOpen() {- return getAttributes().getValue(OPEN);+ public Optional<Boolean> getPosition() {+ return getAttributes().getValue(POSITION);}public Optional<Boolean> getLocked() {return getAttributes().getValue(LOCKED);}++ public Optional<String> getLastAccess() {+ return getAttributes().getValue(LAST_ACCESS);+ }}