Skip to content

armgit / core

Public Imported from GitHub
0

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

Z wave classes rename

Rich Turner488de94b7d62
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java
similarity index 83%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java
index c112bcb53..9b20dfc04 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java
@@ -27,7 +27,7 @@ import javax.persistence.Entity;
import java.util.Optional;
@Entity
-public class ZWAgent extends Agent<ZWAgent, ZWProtocol, ZWAgent.ZWAgentLink> {
+public class ZWaveAgent extends Agent<ZWaveAgent, ZWaveProtocol, ZWaveAgent.ZWAgentLink> {
public static class ZWAgentLink extends AgentLink<ZWAgentLink> {
@@ -58,22 +58,22 @@ public class ZWAgent extends Agent<ZWAgent, ZWProtocol, ZWAgent.ZWAgentLink> {
}
}
- public static AgentDescriptor<ZWAgent, ZWProtocol, ZWAgentLink> DESCRIPTOR = new AgentDescriptor<>(
- ZWAgent.class, ZWProtocol.class, ZWAgentLink.class, null
+ public static AgentDescriptor<ZWaveAgent, ZWaveProtocol, ZWAgentLink> DESCRIPTOR = new AgentDescriptor<>(
+ ZWaveAgent.class, ZWaveProtocol.class, ZWAgentLink.class, null
);
/**
* For use by hydrators (i.e. JPA/Jackson)
*/
- protected ZWAgent() {
+ protected ZWaveAgent() {
}
- public ZWAgent(String name) {
+ public ZWaveAgent(String name) {
super(name);
}
@Override
- public ZWProtocol getProtocolInstance() {
- return new ZWProtocol(this);
+ public ZWaveProtocol getProtocolInstance() {
+ return new ZWaveProtocol(this);
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWNetwork.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
similarity index 97%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWNetwork.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
index d0437d616..7e99f1359 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWNetwork.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveNetwork.java
@@ -53,16 +53,16 @@ import static java.util.stream.Collectors.toList;
import static org.openremote.model.value.MetaItemType.AGENT_LINK;
import static org.openremote.protocol.zwave.model.ZWNodeInitializerListener.NodeInitState.INITIALIZATION_FINISHED;
-public class ZWNetwork {
+public class ZWaveNetwork {
protected Controller controller;
private final List<Consumer<ConnectionStatus>> connectionStatusConsumers = new CopyOnWriteArrayList<>();
private final Map<Consumer<Value>, ChannelConsumerLink> consumerLinkMap = new HashMap<>();
protected String serialPort;
- protected ZWSerialIoClient ioClient;
+ protected ZWaveSerialIoClient ioClient;
protected ScheduledExecutorService executorService;
- public ZWNetwork(String serialPort, ScheduledExecutorService executorService) {
+ public ZWaveNetwork(String serialPort, ScheduledExecutorService executorService) {
this.serialPort = serialPort;
this.executorService = executorService;
}
@@ -77,7 +77,7 @@ public class ZWNetwork {
configuration.setCommLayer(ZWavePortConfiguration.CommLayer.NETTY);
configuration.setComPort(serialPort);
- ioClient = new ZWSerialIoClient(serialPort);
+ ioClient = new ZWaveSerialIoClient(serialPort);
ioClient.addConnectionStatusConsumer(this::onConnectionStatusChanged);
controller = new Controller(NettyConnectionManager.create(configuration, ioClient));
@@ -100,7 +100,7 @@ public class ZWNetwork {
try {
controller.disconnect();
} catch (ConnectionException e) {
- ZWProtocol.LOG.log(Level.WARNING, "Exception thrown whilst disconnecting the controller", e);
+ ZWaveProtocol.LOG.log(Level.WARNING, "Exception thrown whilst disconnecting the controller", e);
} finally {
disposeClient();
ioClient = null;
@@ -221,7 +221,7 @@ public class ZWNetwork {
int endpoint = channel.getCommandClass() != null ? channel.getCommandClass().getContext().getDestEndPoint() : 0;
String linkValue = channel.getLinkName();
- ZWAgent.ZWAgentLink agentLink = new ZWAgent.ZWAgentLink(agentId, nodeId, endpoint, linkValue);
+ ZWaveAgent.ZWAgentLink agentLink = new ZWaveAgent.ZWAgentLink(agentId, nodeId, endpoint, linkValue);
attribute.addOrReplaceMeta(
new MetaItem<>(AGENT_LINK, agentLink),
@@ -242,7 +242,7 @@ public class ZWNetwork {
return channel;
}
- public synchronized AssetTreeNode[] discoverDevices(ZWAgent agent) {
+ public synchronized AssetTreeNode[] discoverDevices(ZWaveAgent agent) {
if (controller == null) {
return new AssetTreeNode[0];
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketDecoder.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketDecoder.java
similarity index 95%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketDecoder.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketDecoder.java
index f42dca8a3..1c2f62735 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketDecoder.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketDecoder.java
@@ -25,7 +25,7 @@ import io.netty.handler.codec.ByteToMessageDecoder;
import java.util.List;
-public class ZWPacketDecoder extends ByteToMessageDecoder {
+public class ZWavePacketDecoder extends ByteToMessageDecoder {
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> messages) throws Exception {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketEncoder.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketEncoder.java
similarity index 94%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketEncoder.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketEncoder.java
index 8058fd156..786641767 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWPacketEncoder.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWavePacketEncoder.java
@@ -23,7 +23,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
-public class ZWPacketEncoder extends MessageToByteEncoder<byte[]> {
+public class ZWavePacketEncoder extends MessageToByteEncoder<byte[]> {
@Override
protected void encode(ChannelHandlerContext ctx, byte[] message, ByteBuf buf) throws Exception {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java
similarity index 91%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWProtocol.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java
index 1627a9e37..30905b9c6 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
import static org.openremote.model.asset.agent.AgentLink.getOrThrowAgentLinkProperty;
-public class ZWProtocol extends AbstractProtocol<ZWAgent, ZWAgent.ZWAgentLink> implements ProtocolAssetDiscovery {
+public class ZWaveProtocol extends AbstractProtocol<ZWaveAgent, ZWaveAgent.ZWAgentLink> implements ProtocolAssetDiscovery {
// Constants ------------------------------------------------------------------------------------
@@ -48,14 +48,14 @@ public class ZWProtocol extends AbstractProtocol<ZWAgent, ZWAgent.ZWAgentLink> i
// Class Members --------------------------------------------------------------------------------
- public static final Logger LOG = SyslogCategory.getLogger(SyslogCategory.PROTOCOL, ZWProtocol.class.getName());
+ public static final Logger LOG = SyslogCategory.getLogger(SyslogCategory.PROTOCOL, ZWaveProtocol.class.getName());
// Protected Instance Fields --------------------------------------------------------------------
- protected ZWNetwork network;
+ protected ZWaveNetwork network;
protected Map<AttributeRef, Consumer<Value>> sensorValueConsumerMap;
- public ZWProtocol(ZWAgent agent) {
+ public ZWaveProtocol(ZWaveAgent agent) {
super(agent);
}
@@ -76,7 +76,7 @@ public class ZWProtocol extends AbstractProtocol<ZWAgent, ZWAgent.ZWAgentLink> i
@Override
protected void doStart(Container container) throws Exception {
String serialPort = agent.getSerialPort().orElseThrow(() -> new IllegalStateException("Invalid serial port property"));
- ZWNetwork network = new ZWNetwork(serialPort, executorService);
+ ZWaveNetwork network = new ZWaveNetwork(serialPort, executorService);
network.addConnectionStatusConsumer(this::setConnectionStatus);
network.connect();
}
@@ -90,7 +90,7 @@ public class ZWProtocol extends AbstractProtocol<ZWAgent, ZWAgent.ZWAgentLink> i
}
@Override
- protected synchronized void doLinkAttribute(String assetId, Attribute<?> attribute, ZWAgent.ZWAgentLink agentLink) {
+ protected synchronized void doLinkAttribute(String assetId, Attribute<?> attribute, ZWaveAgent.ZWAgentLink agentLink) {
int nodeId = agentLink.getDeviceNodeId().orElse(0);
int endpoint = agentLink.getDeviceEndpoint().orElse(0);
@@ -106,14 +106,14 @@ public class ZWProtocol extends AbstractProtocol<ZWAgent, ZWAgent.ZWAgentLink> i
}
@Override
- protected synchronized void doUnlinkAttribute(String assetId, Attribute<?> attribute, ZWAgent.ZWAgentLink agentLink) {
+ protected synchronized void doUnlinkAttribute(String assetId, Attribute<?> attribute, ZWaveAgent.ZWAgentLink agentLink) {
AttributeRef attributeRef = new AttributeRef(assetId, attribute.getName());
Consumer<Value> sensorValueConsumer = sensorValueConsumerMap.remove(attributeRef);
network.removeSensorValueConsumer(sensorValueConsumer);
}
@Override
- protected void doLinkedAttributeWrite(Attribute<?> attribute, ZWAgent.ZWAgentLink agentLink, AttributeEvent event, Object processedValue) {
+ protected void doLinkedAttributeWrite(Attribute<?> attribute, ZWaveAgent.ZWAgentLink agentLink, AttributeEvent event, Object processedValue) {
int nodeId = getOrThrowAgentLinkProperty(agentLink.getDeviceNodeId(), "device node ID");
int endpoint = getOrThrowAgentLinkProperty(agentLink.getDeviceEndpoint(), "device endpoint");
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWSerialIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveSerialIoClient.java
similarity index 95%
rename from agent/src/main/java/org/openremote/agent/protocol/zwave/ZWSerialIoClient.java
rename to agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveSerialIoClient.java
index 4b3d54ce0..50f35f2ff 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWSerialIoClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveSerialIoClient.java
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
/**
* Wrapper around {@link SerialIoClient} to allow compatibility with Z Wave library
*/
-public class ZWSerialIoClient extends SerialIoClient<byte[]> implements TransportLayer {
+public class ZWaveSerialIoClient extends SerialIoClient<byte[]> implements TransportLayer {
// Constants ----------------------------------------------------------------------------------
@@ -56,13 +56,13 @@ public class ZWSerialIoClient extends SerialIoClient<byte[]> implements Transpor
// Constructors -------------------------------------------------------------------------------
- public ZWSerialIoClient(String port) {
+ public ZWaveSerialIoClient(String port) {
super(port, 115200);
setEncoderDecoderProvider(
() -> new ChannelHandler[] {
- new ZWPacketEncoder(),
- new ZWPacketDecoder(),
+ new ZWavePacketEncoder(),
+ new ZWavePacketDecoder(),
new AbstractNettyIoClient.MessageToMessageDecoder<>(byte[].class, this)
}
);