Skip to content

armgit / core

Public Imported from GitHub
0

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

SerialAgent name cleanup

Rich Turner4b980a555da9
diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialProtocol.java
similarity index 84%
rename from agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialClientProtocol.java
rename to agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialProtocol.java
index bdaa0c198..54d4ab898 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/AbstractSerialProtocol.java
@@ -28,9 +28,9 @@ import org.openremote.model.asset.agent.AgentLink;
* This is an abstract TCP client protocol for communicating with TCP servers; concrete implementations must provide
* an {@link IOClient <T> for handling over the wire communication}.
*/
-public abstract class AbstractSerialClientProtocol<T extends AbstractIOClientProtocol<T, U, W, X, V>, U extends IOAgent<U, T, V>, V extends AgentLink<?>, W, X extends SerialIOClient<W>> extends AbstractIOClientProtocol<T, U, W, X, V> {
+public abstract class AbstractSerialProtocol<T extends AbstractIOClientProtocol<T, U, W, X, V>, U extends IOAgent<U, T, V>, V extends AgentLink<?>, W, X extends SerialIOClient<W>> extends AbstractIOClientProtocol<T, U, W, X, V> {
- protected AbstractSerialClientProtocol(U agent) {
+ protected AbstractSerialProtocol(U agent) {
super(agent);
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
index b64accbb9..8f3f0110f 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialProtocol.java
@@ -42,12 +42,12 @@ import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;
/**
* This is a generic Serial client protocol for communicating with Serial ports; it uses the {@link SerialIOClient} to
* handle the communication and all messages are processed as strings; if you require custom message type handling
- * then please sub class the {@link AbstractSerialClientProtocol}).
+ * then please sub class the {@link AbstractSerialProtocol}).
*/
-public class SerialProtocol extends AbstractSerialClientProtocol<SerialProtocol, SerialAgent, AgentLink.Default, String, SerialIOClient<String>> {
+public class SerialProtocol extends AbstractSerialProtocol<SerialProtocol, SerialAgent, AgentLink.Default, String, SerialIOClient<String>> {
private static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, SerialProtocol.class);
- public static final String PROTOCOL_DISPLAY_NAME = "Serial Client";
+ public static final String PROTOCOL_DISPLAY_NAME = "Serial";
protected final List<Pair<AttributeRef, Consumer<String>>> protocolMessageConsumers = new ArrayList<>();