You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/03/08 16:01:40 UTC
[incubator-plc4x] 02/03: decapitalize acronyms
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3773363a193ab0792a3ed5cd9b96228b2475fca1
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Mar 8 16:35:36 2018 +0100
decapitalize acronyms
---
.../ads/{ADSPlcDriver.java => AdsPlcDriver.java} | 22 ++--
...bstractRequest.java => AdsAbstractRequest.java} | 16 +--
...tractResponse.java => AdsAbstractResponse.java} | 16 +--
...t.java => AdsAddDeviceNotificationRequest.java} | 28 ++---
....java => AdsAddDeviceNotificationResponse.java} | 32 +++---
.../{ADSCommandType.java => AdsCommandType.java} | 2 +-
...ava => AdsDeleteDeviceNotificationRequest.java} | 32 +++---
...va => AdsDeleteDeviceNotificationResponse.java} | 32 +++---
...uest.java => AdsDeviceNotificationRequest.java} | 32 +++---
...nse.java => AdsDeviceNotificationResponse.java} | 14 +--
...oRequest.java => AdsReadDeviceInfoRequest.java} | 28 ++---
...esponse.java => AdsReadDeviceInfoResponse.java} | 32 +++---
.../{ADSReadRequest.java => AdsReadRequest.java} | 32 +++---
.../{ADSReadResponse.java => AdsReadResponse.java} | 32 +++---
...dStateRequest.java => AdsReadStateRequest.java} | 28 ++---
...tateResponse.java => AdsReadStateResponse.java} | 32 +++---
...dWriteRequest.java => AdsReadWriteRequest.java} | 32 +++---
...riteResponse.java => AdsReadWriteResponse.java} | 32 +++---
...rolRequest.java => AdsWriteControlRequest.java} | 38 +++----
...lResponse.java => AdsWriteControlResponse.java} | 32 +++---
.../{ADSWriteRequest.java => AdsWriteRequest.java} | 32 +++---
...ADSWriteResponse.java => AdsWriteResponse.java} | 32 +++---
.../java/ads/api/commands/UnknownCommand.java | 20 ++--
.../types/{ADSState.java => AdsState.java} | 26 ++---
.../ads/api/generic/{ADSData.java => AdsData.java} | 4 +-
.../api/generic/{AMSHeader.java => AmsHeader.java} | 50 ++++-----
.../api/generic/{AMSPacket.java => AmsPacket.java} | 42 ++++----
.../generic/types/{AMSError.java => AmsError.java} | 26 ++---
.../generic/types/{AMSNetId.java => AmsNetId.java} | 22 ++--
.../generic/types/{AMSPort.java => AmsPort.java} | 42 ++++----
...geFrame.java => AmsSerialAcknowledgeFrame.java} | 20 ++--
.../{AMSSerialFrame.java => AmsSerialFrame.java} | 26 ++---
...ialResetFrame.java => AmsSerialResetFrame.java} | 20 ++--
.../tcp/{AMSTCPPacket.java => AmsTCPPacket.java} | 40 +++----
.../tcp/{AMSTCPHeader.java => AmsTcpHeader.java} | 24 ++---
...nnection.java => AdsAbstractPlcConnection.java} | 38 +++----
...Connection.java => AdsSerialPlcConnection.java} | 18 ++--
...PlcConnection.java => AdsTcpPlcConnection.java} | 26 ++---
.../ads/model/{ADSAddress.java => AdsAddress.java} | 12 +--
...SerialProtocol.java => Ads2SerialProtocol.java} | 40 +++----
.../{ADS2TcpProtocol.java => Ads2TcpProtocol.java} | 118 ++++++++++-----------
...c4X2ADSProtocol.java => Plc4x2AdsProtocol.java} | 72 ++++++-------
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../java/ads/{ADSDumper.java => AdsDumper.java} | 20 ++--
...ADSPlcDriverTest.java => AdsPlcDriverTest.java} | 8 +-
.../ads/api/commands/CommandFactoryMethodTest.java | 40 +++----
.../types/CommandTypesFactoryMethodTest.java | 2 +-
.../ads/api/generic/GenericFactoryMethodTest.java | 12 +--
.../types/{AMSErrorTest.java => AmsErrorTest.java} | 26 ++---
.../types/{AMSNetIdTest.java => AmsNetIdTest.java} | 14 +--
.../types/{AMSPortTest.java => AmsPortTest.java} | 24 ++---
.../types/GenericTypesFactoryMethodTest.java | 8 +-
...ionTests.java => AdsTcpPlcConnectionTests.java} | 14 +--
.../{ADSAddressTest.java => AdsAddressTest.java} | 16 ++-
...otocolTest.java => Ads2SerialProtocolTest.java} | 66 ++++++------
...pProtocolTest.java => Ads2TcpProtocolTest.java} | 80 +++++++-------
...colTest.java => Plc4X2Ads2TcpProtocolTest.java} | 62 +++++------
.../java/ads/protocol/ADSProtocolBenchmark.java | 62 +++++------
58 files changed, 874 insertions(+), 876 deletions(-)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/ADSPlcDriver.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
similarity index 76%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/ADSPlcDriver.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
index 7950c37..35d11f8 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/ADSPlcDriver.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
@@ -19,9 +19,9 @@ under the License.
package org.apache.plc4x.java.ads;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
-import org.apache.plc4x.java.ads.connection.ADSTcpPlcConnection;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
import org.apache.plc4x.java.api.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.connection.PlcConnection;
@@ -37,12 +37,12 @@ import java.util.regex.Pattern;
* - ADS Protocol
* - TCP
*/
-public class ADSPlcDriver implements PlcDriver {
+public class AdsPlcDriver implements PlcDriver {
private static final Pattern ADS_ADDRESS_PATTERN =
- Pattern.compile("(?<targetAmsNetId>" + AMSNetId.AMS_NET_ID_PATTERN + "):(?<targetAmsPort>" + AMSPort.AMS_PORT_PATTERN + ")"
+ Pattern.compile("(?<targetAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<targetAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
+ "(/"
- + "(?<sourceAmsNetId>" + AMSNetId.AMS_NET_ID_PATTERN + "):(?<sourceAmsPort>" + AMSPort.AMS_PORT_PATTERN + ")"
+ + "(?<sourceAmsNetId>" + AmsNetId.AMS_NET_ID_PATTERN + "):(?<sourceAmsPort>" + AmsPort.AMS_PORT_PATTERN + ")"
+ ")?");
private static final Pattern ADS_URI_PATTERN = Pattern.compile("^ads://(?<host>\\w+)(:(?<port>\\d*))?/" + ADS_ADDRESS_PATTERN);
@@ -66,14 +66,14 @@ public class ADSPlcDriver implements PlcDriver {
String host = matcher.group("host");
String portString = matcher.group("port");
Integer port = StringUtils.isNotBlank(portString) ? Integer.parseInt(portString) : null;
- AMSNetId targetAmsNetId = AMSNetId.of(matcher.group("targetAmsNetId"));
- AMSPort targetAmsPort = AMSPort.of(matcher.group("targetAmsPort"));
+ AmsNetId targetAmsNetId = AmsNetId.of(matcher.group("targetAmsNetId"));
+ AmsPort targetAmsPort = AmsPort.of(matcher.group("targetAmsPort"));
String sourceAmsNetIdString = matcher.group("sourceAmsNetId");
- AMSNetId sourceAmsNetId = StringUtils.isNotBlank(sourceAmsNetIdString) ? AMSNetId.of(sourceAmsNetIdString) : null;
+ AmsNetId sourceAmsNetId = StringUtils.isNotBlank(sourceAmsNetIdString) ? AmsNetId.of(sourceAmsNetIdString) : null;
String sourceAmsPortString = matcher.group("sourceAmsPort");
- AMSPort sourceAmsPort = StringUtils.isNotBlank(sourceAmsPortString) ? AMSPort.of(sourceAmsPortString) : null;
+ AmsPort sourceAmsPort = StringUtils.isNotBlank(sourceAmsPortString) ? AmsPort.of(sourceAmsPortString) : null;
try {
- return new ADSTcpPlcConnection(InetAddress.getByName(host), port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+ return new AdsTcpPlcConnection(InetAddress.getByName(host), port, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
} catch (UnknownHostException e) {
throw new PlcConnectionException(e);
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
similarity index 67%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
index 27506fb..97b2864 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractRequest.java
@@ -18,23 +18,23 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.generic.types.State;
-public abstract class ADSAbstractRequest extends AMSPacket {
- protected ADSAbstractRequest(AMSHeader amsHeader) {
+public abstract class AdsAbstractRequest extends AmsPacket {
+ protected AdsAbstractRequest(AmsHeader amsHeader) {
super(amsHeader);
}
- protected ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+ protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
}
- protected ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId) {
+ protected AdsAbstractRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
similarity index 67%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
index 1c4f24a..f1a930a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAbstractResponse.java
@@ -18,23 +18,23 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.generic.types.State;
-public abstract class ADSAbstractResponse extends AMSPacket {
- protected ADSAbstractResponse(AMSHeader amsHeader) {
+public abstract class AdsAbstractResponse extends AmsPacket {
+ protected AdsAbstractResponse(AmsHeader amsHeader) {
super(amsHeader);
}
- protected ADSAbstractResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+ protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT_RESPONSE, invokeId);
}
- protected ADSAbstractResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId) {
+ protected AdsAbstractResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
similarity index 86%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
index 38db4e2..8b1d100 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationRequest.java
@@ -19,8 +19,8 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
import org.apache.plc4x.java.ads.api.generic.types.*;
import org.apache.plc4x.java.ads.api.util.ByteValue;
@@ -32,8 +32,8 @@ import static java.util.Objects.requireNonNull;
* Note: We recommend to announce not more then 550 notifications per device.
* You can increase the payload by organizing the data in structures.
*/
-@ADSCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
-public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
+public class AdsAddDeviceNotificationRequest extends AdsAbstractRequest {
/**
* 4 bytes Index Group of the data, which should be sent per notification.
@@ -64,7 +64,7 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
*/
private final Reserved reserved;
- private ADSAddDeviceNotificationRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+ private AdsAddDeviceNotificationRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
super(amsHeader);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -75,7 +75,7 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
this.reserved = Reserved.INSTANCE;
}
- private ADSAddDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+ private AdsAddDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -87,16 +87,16 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime, reserved);
}
- public static ADSAddDeviceNotificationRequest of(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
- return new ADSAddDeviceNotificationRequest(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+ public static AdsAddDeviceNotificationRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+ return new AdsAddDeviceNotificationRequest(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
}
- public static ADSAddDeviceNotificationRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
- return new ADSAddDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+ public static AdsAddDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+ return new AdsAddDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
}
public IndexGroup getIndexGroup() {
@@ -131,12 +131,12 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSAddDeviceNotificationRequest))
+ if (!(o instanceof AdsAddDeviceNotificationRequest))
return false;
if (!super.equals(o))
return false;
- ADSAddDeviceNotificationRequest that = (ADSAddDeviceNotificationRequest) o;
+ AdsAddDeviceNotificationRequest that = (AdsAddDeviceNotificationRequest) o;
if (!indexGroup.equals(that.indexGroup))
return false;
@@ -169,7 +169,7 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSAddDeviceNotificationRequest{" +
+ return "AdsAddDeviceNotificationRequest{" +
"indexGroup=" + indexGroup +
", indexOffset=" + indexOffset +
", length=" + length +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
similarity index 73%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
index 6e32975..51c0f9d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsAddDeviceNotificationResponse.java
@@ -20,10 +20,10 @@ package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -32,8 +32,8 @@ import static java.util.Objects.requireNonNull;
/**
* A notification is created in an ADS device.
*/
-@ADSCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
-public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_ADD_DEVICE_NOTIFICATION)
+public class AdsAddDeviceNotificationResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
@@ -45,24 +45,24 @@ public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
*/
private final NotificationHandle notificationHandle;
- private ADSAddDeviceNotificationResponse(AMSHeader amsHeader, Result result, NotificationHandle notificationHandle) {
+ private AdsAddDeviceNotificationResponse(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
super(amsHeader);
this.result = requireNonNull(result);
this.notificationHandle = requireNonNull(notificationHandle);
}
- private ADSAddDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
+ private AdsAddDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
this.notificationHandle = requireNonNull(notificationHandle);
}
- public static ADSAddDeviceNotificationResponse of(AMSHeader amsHeader, Result result, NotificationHandle notificationHandle) {
- return new ADSAddDeviceNotificationResponse(amsHeader, result, notificationHandle);
+ public static AdsAddDeviceNotificationResponse of(AmsHeader amsHeader, Result result, NotificationHandle notificationHandle) {
+ return new AdsAddDeviceNotificationResponse(amsHeader, result, notificationHandle);
}
- public static ADSAddDeviceNotificationResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
- return new ADSAddDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, notificationHandle);
+ public static AdsAddDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
+ return new AdsAddDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, notificationHandle);
}
public Result getResult() {
@@ -74,7 +74,7 @@ public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result, notificationHandle);
}
@@ -82,12 +82,12 @@ public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSAddDeviceNotificationResponse))
+ if (!(o instanceof AdsAddDeviceNotificationResponse))
return false;
if (!super.equals(o))
return false;
- ADSAddDeviceNotificationResponse that = (ADSAddDeviceNotificationResponse) o;
+ AdsAddDeviceNotificationResponse that = (AdsAddDeviceNotificationResponse) o;
if (!result.equals(that.result))
return false;
@@ -105,7 +105,7 @@ public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSAddDeviceNotificationResponse{" +
+ return "AdsAddDeviceNotificationResponse{" +
"result=" + result +
", notificationHandle=" + notificationHandle +
"} " + super.toString();
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSCommandType.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
similarity index 97%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSCommandType.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
index e3d7619..746e6be 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSCommandType.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java
@@ -31,6 +31,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@SuppressWarnings("squid:S00107")
-public @interface ADSCommandType {
+public @interface AdsCommandType {
Command value();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
similarity index 69%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
index 9ddbd3b..5ea71ac 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationRequest.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.NotificationHandle;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,30 +31,30 @@ import static java.util.Objects.requireNonNull;
/**
* One before defined notification is deleted in an ADS device.
*/
-@ADSCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
-public class ADSDeleteDeviceNotificationRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
+public class AdsDeleteDeviceNotificationRequest extends AdsAbstractRequest {
/**
* 4 bytes Handle of notification
*/
private final NotificationHandle notificationHandle;
- private ADSDeleteDeviceNotificationRequest(AMSHeader amsHeader, NotificationHandle notificationHandle) {
+ private AdsDeleteDeviceNotificationRequest(AmsHeader amsHeader, NotificationHandle notificationHandle) {
super(amsHeader);
this.notificationHandle = requireNonNull(notificationHandle);
}
- private ADSDeleteDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
+ private AdsDeleteDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.notificationHandle = requireNonNull(notificationHandle);
}
- public static ADSDeleteDeviceNotificationRequest of(AMSHeader amsHeader, NotificationHandle notificationHandle) {
- return new ADSDeleteDeviceNotificationRequest(amsHeader, notificationHandle);
+ public static AdsDeleteDeviceNotificationRequest of(AmsHeader amsHeader, NotificationHandle notificationHandle) {
+ return new AdsDeleteDeviceNotificationRequest(amsHeader, notificationHandle);
}
- public static ADSDeleteDeviceNotificationRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
- return new ADSDeleteDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, notificationHandle);
+ public static AdsDeleteDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
+ return new AdsDeleteDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, notificationHandle);
}
public NotificationHandle getNotificationHandle() {
@@ -62,7 +62,7 @@ public class ADSDeleteDeviceNotificationRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(notificationHandle);
}
@@ -70,12 +70,12 @@ public class ADSDeleteDeviceNotificationRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSDeleteDeviceNotificationRequest))
+ if (!(o instanceof AdsDeleteDeviceNotificationRequest))
return false;
if (!super.equals(o))
return false;
- ADSDeleteDeviceNotificationRequest that = (ADSDeleteDeviceNotificationRequest) o;
+ AdsDeleteDeviceNotificationRequest that = (AdsDeleteDeviceNotificationRequest) o;
return notificationHandle.equals(that.notificationHandle);
}
@@ -89,7 +89,7 @@ public class ADSDeleteDeviceNotificationRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSDeleteDeviceNotificationRequest{" +
+ return "AdsDeleteDeviceNotificationRequest{" +
"notificationHandle=" + notificationHandle +
"} " + super.toString();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
similarity index 66%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
index 980e916..417b9c7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeleteDeviceNotificationResponse.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,30 +31,30 @@ import static java.util.Objects.requireNonNull;
/**
* One before defined notification is deleted in an ADS device.
*/
-@ADSCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
-public class ADSDeleteDeviceNotificationResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_DELETE_DEVICE_NOTIFICATION)
+public class AdsDeleteDeviceNotificationResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
*/
private final Result result;
- private ADSDeleteDeviceNotificationResponse(AMSHeader amsHeader, Result result) {
+ private AdsDeleteDeviceNotificationResponse(AmsHeader amsHeader, Result result) {
super(amsHeader);
this.result = requireNonNull(result);
}
- private ADSDeleteDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
+ private AdsDeleteDeviceNotificationResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
}
- public static ADSDeleteDeviceNotificationResponse of(AMSHeader amsHeader, Result result) {
- return new ADSDeleteDeviceNotificationResponse(amsHeader, result);
+ public static AdsDeleteDeviceNotificationResponse of(AmsHeader amsHeader, Result result) {
+ return new AdsDeleteDeviceNotificationResponse(amsHeader, result);
}
- public static ADSDeleteDeviceNotificationResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
- return new ADSDeleteDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+ public static AdsDeleteDeviceNotificationResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+ return new AdsDeleteDeviceNotificationResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
}
public Result getResult() {
@@ -62,7 +62,7 @@ public class ADSDeleteDeviceNotificationResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result);
}
@@ -70,12 +70,12 @@ public class ADSDeleteDeviceNotificationResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSDeleteDeviceNotificationResponse))
+ if (!(o instanceof AdsDeleteDeviceNotificationResponse))
return false;
if (!super.equals(o))
return false;
- ADSDeleteDeviceNotificationResponse that = (ADSDeleteDeviceNotificationResponse) o;
+ AdsDeleteDeviceNotificationResponse that = (AdsDeleteDeviceNotificationResponse) o;
return result.equals(that.result);
}
@@ -89,7 +89,7 @@ public class ADSDeleteDeviceNotificationResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSDeleteDeviceNotificationResponse{" +
+ return "AdsDeleteDeviceNotificationResponse{" +
"result=" + result +
"} " + super.toString();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
similarity index 81%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
index dbf0ad5..6b75109 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.AdsStampHeader;
import org.apache.plc4x.java.ads.api.commands.types.Length;
import org.apache.plc4x.java.ads.api.commands.types.Stamps;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.ByteReadable;
@@ -39,8 +39,8 @@ import static java.util.Objects.requireNonNull;
* <p>
* The data which are transfered at the Device Notification are multiple nested into one another. The Notification Stream contains an array with elements of type AdsStampHeader. This array again contains elements of type AdsNotificationSample.
*/
-@ADSCommandType(Command.ADS_DEVICE_NOTIFICATION)
-public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
+public class AdsDeviceNotificationRequest extends AdsAbstractRequest {
/**
* 4 bytes Size of data in byte.
@@ -57,7 +57,7 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
private final LengthSupplier lengthSupplier;
- private ADSDeviceNotificationRequest(AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+ private AdsDeviceNotificationRequest(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
super(amsHeader);
this.length = requireNonNull(length);
this.stamps = requireNonNull(stamps);
@@ -65,7 +65,7 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
lengthSupplier = null;
}
- private ADSDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+ private AdsDeviceNotificationRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.length = null;
this.stamps = requireNonNull(stamps);
@@ -79,12 +79,12 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
};
}
- public static ADSDeviceNotificationRequest of(AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
- return new ADSDeviceNotificationRequest(amsHeader, length, stamps, adsStampHeaders);
+ public static AdsDeviceNotificationRequest of(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+ return new AdsDeviceNotificationRequest(amsHeader, length, stamps, adsStampHeaders);
}
- public static ADSDeviceNotificationRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
- return new ADSDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, stamps, adsStampHeaders);
+ public static AdsDeviceNotificationRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+ return new AdsDeviceNotificationRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, stamps, adsStampHeaders);
}
public Length getLength() {
@@ -104,7 +104,7 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(getLength(), stamps, buildADSData(adsStampHeaders.toArray(new ByteReadable[adsStampHeaders.size()])));
}
@@ -112,12 +112,12 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSDeviceNotificationRequest))
+ if (!(o instanceof AdsDeviceNotificationRequest))
return false;
if (!super.equals(o))
return false;
- ADSDeviceNotificationRequest that = (ADSDeviceNotificationRequest) o;
+ AdsDeviceNotificationRequest that = (AdsDeviceNotificationRequest) o;
if (!getLength().equals(that.getLength()))
return false;
@@ -138,7 +138,7 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSDeviceNotificationRequest{" +
+ return "AdsDeviceNotificationRequest{" +
"length=" + getLength() +
", stamps=" + stamps +
", adsStampHeaders=" + adsStampHeaders +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
similarity index 75%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
index e8cb2e9..6491a2d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java
@@ -18,23 +18,23 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
import org.apache.plc4x.java.ads.api.generic.types.Command;
/**
* Data will carry forward independently from an ADS device to a Client
*/
-@ADSCommandType(Command.ADS_DEVICE_NOTIFICATION)
-public class ADSDeviceNotificationResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_DEVICE_NOTIFICATION)
+public class AdsDeviceNotificationResponse extends AdsAbstractResponse {
- protected ADSDeviceNotificationResponse() {
+ protected AdsDeviceNotificationResponse() {
super(null);
- // There is no {@link ADSDeviceNotificationResponse} specified
+ // There is no {@link AdsDeviceNotificationResponse} specified
}
@Override
- public ADSData getAdsData() {
- return ADSData.EMPTY;
+ public AdsData getAdsData() {
+ return AdsData.EMPTY;
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
similarity index 59%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
index 5a315ae..186d977 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoRequest.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -30,28 +30,28 @@ import org.apache.plc4x.java.ads.api.generic.types.Invoke;
* <p>
* No additional data required
*/
-@ADSCommandType(Command.ADS_READ_DEVICE_INFO)
-public class ADSReadDeviceInfoRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
+public class AdsReadDeviceInfoRequest extends AdsAbstractRequest {
- private ADSReadDeviceInfoRequest(AMSHeader amsHeader) {
+ private AdsReadDeviceInfoRequest(AmsHeader amsHeader) {
super(amsHeader);
}
- private ADSReadDeviceInfoRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+ private AdsReadDeviceInfoRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
}
- public static ADSReadDeviceInfoRequest of(AMSHeader amsHeader) {
- return new ADSReadDeviceInfoRequest(amsHeader);
+ public static AdsReadDeviceInfoRequest of(AmsHeader amsHeader) {
+ return new AdsReadDeviceInfoRequest(amsHeader);
}
- public static ADSReadDeviceInfoRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
- return new ADSReadDeviceInfoRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+ public static AdsReadDeviceInfoRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+ return new AdsReadDeviceInfoRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
}
@Override
- public ADSData getAdsData() {
- return ADSData.EMPTY;
+ public AdsData getAdsData() {
+ return AdsData.EMPTY;
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
similarity index 81%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
index 394954c..cd977d3 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadDeviceInfoResponse.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,8 +31,8 @@ import static java.util.Objects.requireNonNull;
/**
* Reads the name and the version number of the ADS device.
*/
-@ADSCommandType(Command.ADS_READ_DEVICE_INFO)
-public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_READ_DEVICE_INFO)
+public class AdsReadDeviceInfoResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number.
*/
@@ -54,7 +54,7 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
*/
private final Device device;
- private ADSReadDeviceInfoResponse(AMSHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+ private AdsReadDeviceInfoResponse(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
super(amsHeader);
this.result = requireNonNull(result);
this.majorVersion = requireNonNull(majorVersion);
@@ -63,7 +63,7 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
this.device = requireNonNull(device);
}
- private ADSReadDeviceInfoResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+ private AdsReadDeviceInfoResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
this.majorVersion = requireNonNull(majorVersion);
@@ -72,12 +72,12 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
this.device = requireNonNull(device);
}
- public static ADSReadDeviceInfoResponse of(AMSHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
- return new ADSReadDeviceInfoResponse(amsHeader, result, majorVersion, minorVersion, version, device);
+ public static AdsReadDeviceInfoResponse of(AmsHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+ return new AdsReadDeviceInfoResponse(amsHeader, result, majorVersion, minorVersion, version, device);
}
- public static ADSReadDeviceInfoResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
- return new ADSReadDeviceInfoResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, majorVersion, minorVersion, version, device);
+ public static AdsReadDeviceInfoResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+ return new AdsReadDeviceInfoResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, majorVersion, minorVersion, version, device);
}
public Result getResult() {
@@ -101,7 +101,7 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result, majorVersion, minorVersion, version, device);
}
@@ -109,12 +109,12 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadDeviceInfoResponse))
+ if (!(o instanceof AdsReadDeviceInfoResponse))
return false;
if (!super.equals(o))
return false;
- ADSReadDeviceInfoResponse that = (ADSReadDeviceInfoResponse) o;
+ AdsReadDeviceInfoResponse that = (AdsReadDeviceInfoResponse) o;
if (!result.equals(that.result))
return false;
@@ -141,7 +141,7 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSReadDeviceInfoResponse{" +
+ return "AdsReadDeviceInfoResponse{" +
"result=" + result +
", majorVersion=" + majorVersion +
", minorVersion=" + minorVersion +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
similarity index 78%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
index c20f435..ba6d15d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadRequest.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -33,8 +33,8 @@ import static java.util.Objects.requireNonNull;
/**
* With ADS Read data can be read from an ADS device. The data are addressed by the Index Group and the Index Offset
*/
-@ADSCommandType(Command.ADS_READ)
-public class ADSReadRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_READ)
+public class AdsReadRequest extends AdsAbstractRequest {
/**
* 4 bytes Index Group of the data which should be read.
@@ -51,26 +51,26 @@ public class ADSReadRequest extends ADSAbstractRequest {
*/
private final Length length;
- private ADSReadRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+ private AdsReadRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
super(amsHeader);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
this.length = requireNonNull(length);
}
- private ADSReadRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+ private AdsReadRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
this.length = requireNonNull(length);
}
- public static ADSReadRequest of(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
- return new ADSReadRequest(amsHeader, indexGroup, indexOffset, length);
+ public static AdsReadRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+ return new AdsReadRequest(amsHeader, indexGroup, indexOffset, length);
}
- public static ADSReadRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
- return new ADSReadRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
+ public static AdsReadRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length) {
+ return new AdsReadRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
}
public IndexGroup getIndexGroup() {
@@ -86,7 +86,7 @@ public class ADSReadRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(indexGroup, indexOffset, length);
}
@@ -94,12 +94,12 @@ public class ADSReadRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadRequest))
+ if (!(o instanceof AdsReadRequest))
return false;
if (!super.equals(o))
return false;
- ADSReadRequest that = (ADSReadRequest) o;
+ AdsReadRequest that = (AdsReadRequest) o;
if (!indexGroup.equals(that.indexGroup))
return false;
@@ -120,7 +120,7 @@ public class ADSReadRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSReadRequest{" +
+ return "AdsReadRequest{" +
"indexGroup=" + indexGroup +
", indexOffset=" + indexOffset +
", length=" + length +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
similarity index 77%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
index 6e51c58..69f2a2e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.Length;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
@@ -34,8 +34,8 @@ import static java.util.Objects.requireNonNull;
/**
* With ADS Read data can be read from an ADS device
*/
-@ADSCommandType(Command.ADS_READ)
-public class ADSReadResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_READ)
+public class AdsReadResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
@@ -52,7 +52,7 @@ public class ADSReadResponse extends ADSAbstractResponse {
private final LengthSupplier lengthSupplier;
- private ADSReadResponse(AMSHeader amsHeader, Result result, Length length, Data data) {
+ private AdsReadResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
super(amsHeader);
this.result = requireNonNull(result);
this.length = requireNonNull(length);
@@ -60,7 +60,7 @@ public class ADSReadResponse extends ADSAbstractResponse {
this.lengthSupplier = null;
}
- private ADSReadResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+ private AdsReadResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
this.length = null;
@@ -68,16 +68,16 @@ public class ADSReadResponse extends ADSAbstractResponse {
this.lengthSupplier = data;
}
- public static ADSReadResponse of(AMSHeader amsHeader, Result result, Length length, Data data) {
- return new ADSReadResponse(amsHeader, result, length, data);
+ public static AdsReadResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
+ return new AdsReadResponse(amsHeader, result, length, data);
}
- public static ADSReadResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
- return new ADSReadResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
+ public static AdsReadResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+ return new AdsReadResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result, getLength(), data);
}
@@ -97,12 +97,12 @@ public class ADSReadResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadResponse))
+ if (!(o instanceof AdsReadResponse))
return false;
if (!super.equals(o))
return false;
- ADSReadResponse that = (ADSReadResponse) o;
+ AdsReadResponse that = (AdsReadResponse) o;
if (!result.equals(that.result))
return false;
@@ -123,7 +123,7 @@ public class ADSReadResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSReadResponse{" +
+ return "AdsReadResponse{" +
"result=" + result +
", length=" + getLength() +
", data=" + data +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
similarity index 59%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
index 38749ff..e11fb94 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateRequest.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -30,28 +30,28 @@ import org.apache.plc4x.java.ads.api.generic.types.Invoke;
* <p>
* No additional data required
*/
-@ADSCommandType(Command.ADS_READ_STATE)
-public class ADSReadStateRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_READ_STATE)
+public class AdsReadStateRequest extends AdsAbstractRequest {
- private ADSReadStateRequest(AMSHeader amsHeader) {
+ private AdsReadStateRequest(AmsHeader amsHeader) {
super(amsHeader);
}
- private ADSReadStateRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+ private AdsReadStateRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
}
- public static ADSReadStateRequest of(AMSHeader amsHeader) {
- return new ADSReadStateRequest(amsHeader);
+ public static AdsReadStateRequest of(AmsHeader amsHeader) {
+ return new AdsReadStateRequest(amsHeader);
}
- public static ADSReadStateRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
- return new ADSReadStateRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
+ public static AdsReadStateRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId) {
+ return new AdsReadStateRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
}
@Override
- public ADSData getAdsData() {
- return ADSData.EMPTY;
+ public AdsData getAdsData() {
+ return AdsData.EMPTY;
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
similarity index 68%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
index 7514664..5b28873 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadStateResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadStateResponse.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,30 +31,30 @@ import static java.util.Objects.requireNonNull;
/**
* Reads the ADS status and the device status of an ADS device.
*/
-@ADSCommandType(Command.ADS_READ_STATE)
-public class ADSReadStateResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_READ_STATE)
+public class AdsReadStateResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
*/
private final Result result;
- private ADSReadStateResponse(AMSHeader amsHeader, Result result) {
+ private AdsReadStateResponse(AmsHeader amsHeader, Result result) {
super(amsHeader);
this.result = requireNonNull(result);
}
- private ADSReadStateResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
+ private AdsReadStateResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
}
- public static ADSReadStateResponse of(AMSHeader amsHeader, Result result) {
- return new ADSReadStateResponse(amsHeader, result);
+ public static AdsReadStateResponse of(AmsHeader amsHeader, Result result) {
+ return new AdsReadStateResponse(amsHeader, result);
}
- public static ADSReadStateResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
- return new ADSReadStateResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+ public static AdsReadStateResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+ return new AdsReadStateResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
}
public Result getResult() {
@@ -62,7 +62,7 @@ public class ADSReadStateResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result);
}
@@ -70,12 +70,12 @@ public class ADSReadStateResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadStateResponse))
+ if (!(o instanceof AdsReadStateResponse))
return false;
if (!super.equals(o))
return false;
- ADSReadStateResponse that = (ADSReadStateResponse) o;
+ AdsReadStateResponse that = (AdsReadStateResponse) o;
return result.equals(that.result);
}
@@ -89,7 +89,7 @@ public class ADSReadStateResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSReadStateResponse{" +
+ return "AdsReadStateResponse{" +
"result=" + result +
"} " + super.toString();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
similarity index 83%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
index c44d037..c007fdf 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
@@ -34,8 +34,8 @@ import static java.util.Objects.requireNonNull;
* <p>
* The data which can be read are addressed by the Index Group and the Index Offset
*/
-@ADSCommandType(Command.ADS_READ_WRITE)
-public class ADSReadWriteRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_READ_WRITE)
+public class AdsReadWriteRequest extends AdsAbstractRequest {
/**
* 4 bytes Index Group, in which the data should be written.
@@ -60,7 +60,7 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
private final LengthSupplier writeLengthSupplier;
- private ADSReadWriteRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
+ private AdsReadWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
super(amsHeader);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -70,7 +70,7 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
this.writeLengthSupplier = null;
}
- private ADSReadWriteRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
+ private AdsReadWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -80,12 +80,12 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
this.writeLengthSupplier = data;
}
- public static ADSReadWriteRequest of(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
- return new ADSReadWriteRequest(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
+ public static AdsReadWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) {
+ return new AdsReadWriteRequest(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
}
- public static ADSReadWriteRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
- return new ADSReadWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, readLength, data);
+ public static AdsReadWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, Data data) {
+ return new AdsReadWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, readLength, data);
}
public IndexGroup getIndexGroup() {
@@ -109,7 +109,7 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(indexGroup, indexOffset, readLength, getWriteLength(), data);
}
@@ -117,12 +117,12 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadWriteRequest))
+ if (!(o instanceof AdsReadWriteRequest))
return false;
if (!super.equals(o))
return false;
- ADSReadWriteRequest that = (ADSReadWriteRequest) o;
+ AdsReadWriteRequest that = (AdsReadWriteRequest) o;
if (!indexGroup.equals(that.indexGroup))
return false;
@@ -149,7 +149,7 @@ public class ADSReadWriteRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSReadWriteRequest{" +
+ return "AdsReadWriteRequest{" +
"indexGroup=" + indexGroup +
", indexOffset=" + indexOffset +
", readLength=" + readLength +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
similarity index 77%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
index d91faa2..3d5cfcf 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadWriteResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.Length;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
@@ -34,8 +34,8 @@ import static java.util.Objects.requireNonNull;
/**
* With ADS Read Write data will be written to an ADS device. Additionally, data can be read from the ADS device.
*/
-@ADSCommandType(Command.ADS_READ_WRITE)
-public class ADSReadWriteResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_READ_WRITE)
+public class AdsReadWriteResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
@@ -54,7 +54,7 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
private final LengthSupplier lengthSupplier;
- private ADSReadWriteResponse(AMSHeader amsHeader, Result result, Length length, Data data) {
+ private AdsReadWriteResponse(AmsHeader amsHeader, Result result, Length length, Data data) {
super(amsHeader);
this.result = requireNonNull(result);
this.length = requireNonNull(length);
@@ -62,7 +62,7 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
this.lengthSupplier = null;
}
- private ADSReadWriteResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+ private AdsReadWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
this.length = null;
@@ -70,12 +70,12 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
this.lengthSupplier = data;
}
- public static ADSReadWriteResponse of(AMSHeader amsHeader, Result result, Length length, Data data) {
- return new ADSReadWriteResponse(amsHeader, result, length, data);
+ public static AdsReadWriteResponse of(AmsHeader amsHeader, Result result, Length length, Data data) {
+ return new AdsReadWriteResponse(amsHeader, result, length, data);
}
- public static ADSReadWriteResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
- return new ADSReadWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
+ public static AdsReadWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result, Data data) {
+ return new AdsReadWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result, data);
}
public Result getResult() {
@@ -91,7 +91,7 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result, getLength(), data);
}
@@ -99,12 +99,12 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSReadWriteResponse))
+ if (!(o instanceof AdsReadWriteResponse))
return false;
if (!super.equals(o))
return false;
- ADSReadWriteResponse that = (ADSReadWriteResponse) o;
+ AdsReadWriteResponse that = (AdsReadWriteResponse) o;
if (!result.equals(that.result))
return false;
@@ -124,7 +124,7 @@ public class ADSReadWriteResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSReadWriteResponse{" +
+ return "AdsReadWriteResponse{" +
"result=" + result +
", length=" + getLength() +
", data=" + data +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
similarity index 74%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
index a7c76b7..2ec8dbe 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java
@@ -18,14 +18,14 @@
*/
package org.apache.plc4x.java.ads.api.commands;
-import org.apache.plc4x.java.ads.api.commands.types.ADSState;
+import org.apache.plc4x.java.ads.api.commands.types.AdsState;
import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.DeviceState;
import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
@@ -37,13 +37,13 @@ import static java.util.Objects.requireNonNull;
* Additionally it is possible to send data to the ADS device to transfer further information.
* These data were not analysed from the current ADS devices (PLC, NC, ...)
*/
-@ADSCommandType(Command.ADS_WRITE_CONTROL)
-public class ADSWriteControlRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_WRITE_CONTROL)
+public class AdsWriteControlRequest extends AdsAbstractRequest {
/**
* 2 bytes New ADS status (see data type ADSSTATE of the ADS-DLL).
*/
- private final ADSState adsState;
+ private final AdsState adsState;
/**
* 2 bytes New device status.
*/
@@ -59,7 +59,7 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
private final LengthSupplier lengthSupplier;
- private ADSWriteControlRequest(AMSHeader amsHeader, ADSState adsState, DeviceState deviceState, Length length, Data data) {
+ private AdsWriteControlRequest(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
super(amsHeader);
this.adsState = requireNonNull(adsState);
this.deviceState = requireNonNull(deviceState);
@@ -68,7 +68,7 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
this.lengthSupplier = null;
}
- private ADSWriteControlRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, ADSState adsState, DeviceState deviceState, Data data) {
+ private AdsWriteControlRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.adsState = requireNonNull(adsState);
this.deviceState = requireNonNull(deviceState);
@@ -77,15 +77,15 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
this.lengthSupplier = data;
}
- public static ADSWriteControlRequest of(AMSHeader amsHeader, ADSState adsState, DeviceState deviceState, Length length, Data data) {
- return new ADSWriteControlRequest(amsHeader, adsState, deviceState, length, data);
+ public static AdsWriteControlRequest of(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) {
+ return new AdsWriteControlRequest(amsHeader, adsState, deviceState, length, data);
}
- public static ADSWriteControlRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, ADSState adsState, DeviceState deviceState, Data data) {
- return new ADSWriteControlRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, adsState, deviceState, data);
+ public static AdsWriteControlRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, AdsState adsState, DeviceState deviceState, Data data) {
+ return new AdsWriteControlRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, adsState, deviceState, data);
}
- public ADSState getAdsState() {
+ public AdsState getAdsState() {
return adsState;
}
@@ -102,7 +102,7 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(adsState, deviceState, getLength(), data);
}
@@ -110,12 +110,12 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSWriteControlRequest))
+ if (!(o instanceof AdsWriteControlRequest))
return false;
if (!super.equals(o))
return false;
- ADSWriteControlRequest that = (ADSWriteControlRequest) o;
+ AdsWriteControlRequest that = (AdsWriteControlRequest) o;
if (!adsState.equals(that.adsState))
return false;
@@ -139,7 +139,7 @@ public class ADSWriteControlRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSWriteControlRequest{" +
+ return "AdsWriteControlRequest{" +
"adsState=" + adsState +
", deviceState=" + deviceState +
", length=" + getLength() +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
similarity index 68%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
index d9446a3..21aed55 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteControlResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlResponse.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,29 +31,29 @@ import static java.util.Objects.requireNonNull;
/**
* Changes the ADS status and the device status of an ADS device.
*/
-@ADSCommandType(Command.ADS_WRITE_CONTROL)
-public class ADSWriteControlResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_WRITE_CONTROL)
+public class AdsWriteControlResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
*/
private final Result result;
- private ADSWriteControlResponse(AMSHeader amsHeader, Result result) {
+ private AdsWriteControlResponse(AmsHeader amsHeader, Result result) {
super(amsHeader);
this.result = requireNonNull(result);
}
- private ADSWriteControlResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
+ private AdsWriteControlResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
}
- public static ADSWriteControlResponse of(AMSHeader amsHeader, Result result) {
- return new ADSWriteControlResponse(amsHeader, result);
+ public static AdsWriteControlResponse of(AmsHeader amsHeader, Result result) {
+ return new AdsWriteControlResponse(amsHeader, result);
}
- public static ADSWriteControlResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
- return new ADSWriteControlResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+ public static AdsWriteControlResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+ return new AdsWriteControlResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
}
public Result getResult() {
@@ -61,7 +61,7 @@ public class ADSWriteControlResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result);
}
@@ -69,12 +69,12 @@ public class ADSWriteControlResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSWriteControlResponse))
+ if (!(o instanceof AdsWriteControlResponse))
return false;
if (!super.equals(o))
return false;
- ADSWriteControlResponse that = (ADSWriteControlResponse) o;
+ AdsWriteControlResponse that = (AdsWriteControlResponse) o;
return result.equals(that.result);
}
@@ -88,7 +88,7 @@ public class ADSWriteControlResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSWriteControlResponse{" +
+ return "AdsWriteControlResponse{" +
"result=" + result +
"} " + super.toString();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
similarity index 81%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteRequest.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
index 15fcb4e..c1e108b 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteRequest.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java
@@ -22,10 +22,10 @@ import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
import org.apache.plc4x.java.ads.api.commands.types.Length;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
@@ -35,8 +35,8 @@ import static java.util.Objects.requireNonNull;
/**
* With ADS Write data can be written to an ADS device. The data are addressed by the Index Group and the Index Offset.
*/
-@ADSCommandType(Command.ADS_WRITE)
-public class ADSWriteRequest extends ADSAbstractRequest {
+@AdsCommandType(Command.ADS_WRITE)
+public class AdsWriteRequest extends AdsAbstractRequest {
/**
* 4 bytes Index Group in which the data should be written
@@ -57,7 +57,7 @@ public class ADSWriteRequest extends ADSAbstractRequest {
private final LengthSupplier lengthSupplier;
- private ADSWriteRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
+ private AdsWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
super(amsHeader);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -66,7 +66,7 @@ public class ADSWriteRequest extends ADSAbstractRequest {
this.lengthSupplier = null;
}
- private ADSWriteRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
+ private AdsWriteRequest(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.indexGroup = requireNonNull(indexGroup);
this.indexOffset = requireNonNull(indexOffset);
@@ -75,12 +75,12 @@ public class ADSWriteRequest extends ADSAbstractRequest {
this.lengthSupplier = data;
}
- public static ADSWriteRequest of(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
- return new ADSWriteRequest(amsHeader, indexGroup, indexOffset, length, data);
+ public static AdsWriteRequest of(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) {
+ return new AdsWriteRequest(amsHeader, indexGroup, indexOffset, length, data);
}
- public static ADSWriteRequest of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
- return new ADSWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
+ public static AdsWriteRequest of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Data data) {
+ return new AdsWriteRequest(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
}
public IndexGroup getIndexGroup() {
@@ -100,7 +100,7 @@ public class ADSWriteRequest extends ADSAbstractRequest {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(indexGroup, indexOffset, getLength(), data);
}
@@ -108,12 +108,12 @@ public class ADSWriteRequest extends ADSAbstractRequest {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSWriteRequest))
+ if (!(o instanceof AdsWriteRequest))
return false;
if (!super.equals(o))
return false;
- ADSWriteRequest that = (ADSWriteRequest) o;
+ AdsWriteRequest that = (AdsWriteRequest) o;
if (!indexGroup.equals(that.indexGroup))
return false;
@@ -137,7 +137,7 @@ public class ADSWriteRequest extends ADSAbstractRequest {
@Override
public String toString() {
- return "ADSWriteRequest{" +
+ return "AdsWriteRequest{" +
"indexGroup=" + indexGroup +
", indexOffset=" + indexOffset +
", length=" + getLength() +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
similarity index 68%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteResponse.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
index 65a859b..f18b405 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSWriteResponse.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteResponse.java
@@ -19,10 +19,10 @@
package org.apache.plc4x.java.ads.api.commands;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
@@ -31,30 +31,30 @@ import static java.util.Objects.requireNonNull;
/**
* With ADS Write data can be written to an ADS device.
*/
-@ADSCommandType(Command.ADS_WRITE)
-public class ADSWriteResponse extends ADSAbstractResponse {
+@AdsCommandType(Command.ADS_WRITE)
+public class AdsWriteResponse extends AdsAbstractResponse {
/**
* 4 bytes ADS error number
*/
private final Result result;
- private ADSWriteResponse(AMSHeader amsHeader, Result result) {
+ private AdsWriteResponse(AmsHeader amsHeader, Result result) {
super(amsHeader);
this.result = requireNonNull(result);
}
- private ADSWriteResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
+ private AdsWriteResponse(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
this.result = requireNonNull(result);
}
- public static ADSWriteResponse of(AMSHeader amsHeader, Result result) {
- return new ADSWriteResponse(amsHeader, result);
+ public static AdsWriteResponse of(AmsHeader amsHeader, Result result) {
+ return new AdsWriteResponse(amsHeader, result);
}
- public static ADSWriteResponse of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
- return new ADSWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
+ public static AdsWriteResponse of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Invoke invokeId, Result result) {
+ return new AdsWriteResponse(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, result);
}
public Result getResult() {
@@ -62,7 +62,7 @@ public class ADSWriteResponse extends ADSAbstractResponse {
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return buildADSData(result);
}
@@ -70,12 +70,12 @@ public class ADSWriteResponse extends ADSAbstractResponse {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof ADSWriteResponse))
+ if (!(o instanceof AdsWriteResponse))
return false;
if (!super.equals(o))
return false;
- ADSWriteResponse that = (ADSWriteResponse) o;
+ AdsWriteResponse that = (AdsWriteResponse) o;
return result.equals(that.result);
}
@@ -89,7 +89,7 @@ public class ADSWriteResponse extends ADSAbstractResponse {
@Override
public String toString() {
- return "ADSWriteResponse{" +
+ return "AdsWriteResponse{" +
"result=" + result +
"} " + super.toString();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
index 5bbbe30..5172d46 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java
@@ -19,9 +19,9 @@
package org.apache.plc4x.java.ads.api.commands;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
import org.apache.plc4x.java.ads.api.generic.types.*;
import static java.util.Objects.requireNonNull;
@@ -29,31 +29,31 @@ import static java.util.Objects.requireNonNull;
/**
* Unknown ADS Package
*/
-@ADSCommandType(Command.UNKNOWN)
-public class UnknownCommand extends AMSPacket {
+@AdsCommandType(Command.UNKNOWN)
+public class UnknownCommand extends AmsPacket {
private final ByteBuf remainingBytes;
- private UnknownCommand(AMSHeader amsHeader, ByteBuf remainingBytes) {
+ private UnknownCommand(AmsHeader amsHeader, ByteBuf remainingBytes) {
super(amsHeader);
this.remainingBytes = requireNonNull(remainingBytes);
}
- private UnknownCommand(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
+ private UnknownCommand(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
this.remainingBytes = requireNonNull(remainingBytes);
}
@Override
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return () -> remainingBytes;
}
- public static UnknownCommand of(AMSHeader amsHeader, ByteBuf remainingBytes) {
+ public static UnknownCommand of(AmsHeader amsHeader, ByteBuf remainingBytes) {
return new UnknownCommand(amsHeader, remainingBytes);
}
- public static UnknownCommand of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
+ public static UnknownCommand of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) {
return new UnknownCommand(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId, remainingBytes);
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ADSState.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
similarity index 68%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ADSState.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
index e85b479..9705ddd 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/ADSState.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsState.java
@@ -21,39 +21,39 @@ package org.apache.plc4x.java.ads.api.commands.types;
import io.netty.buffer.ByteBuf;
import org.apache.plc4x.java.ads.api.util.UnsignedShortLEByteValue;
-public class ADSState extends UnsignedShortLEByteValue {
+public class AdsState extends UnsignedShortLEByteValue {
public static final int NUM_BYTES = UnsignedShortLEByteValue.UNSIGNED_SHORT_LE_NUM_BYTES;
- private ADSState(byte... values) {
+ private AdsState(byte... values) {
super(values);
}
- private ADSState(int value) {
+ private AdsState(int value) {
super(value);
}
- private ADSState(String value) {
+ private AdsState(String value) {
super(value);
}
- private ADSState(ByteBuf byteBuf) {
+ private AdsState(ByteBuf byteBuf) {
super(byteBuf);
}
- public static ADSState of(byte... values) {
- return new ADSState(values);
+ public static AdsState of(byte... values) {
+ return new AdsState(values);
}
- public static ADSState of(int value) {
- return new ADSState(value);
+ public static AdsState of(int value) {
+ return new AdsState(value);
}
- public static ADSState of(ByteBuf byteBuf) {
- return new ADSState(byteBuf);
+ public static AdsState of(ByteBuf byteBuf) {
+ return new AdsState(byteBuf);
}
- public static ADSState of(String value) {
- return new ADSState(value);
+ public static AdsState of(String value) {
+ return new AdsState(value);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/ADSData.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
similarity index 92%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/ADSData.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
index e97b1dc..032b19f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/ADSData.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AdsData.java
@@ -25,8 +25,8 @@ import org.apache.plc4x.java.ads.api.util.ByteReadable;
* ADS Data n bytes The ADS data range contains the parameter of the single ADS commands. The structure of the data array depends on the ADS command. Some ADS commands require no additional data.
*/
@FunctionalInterface
-public interface ADSData extends ByteReadable {
+public interface AdsData extends ByteReadable {
- ADSData EMPTY = () -> Unpooled.EMPTY_BUFFER;
+ AdsData EMPTY = () -> Unpooled.EMPTY_BUFFER;
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSHeader.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
similarity index 77%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSHeader.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
index 2d6249c..84fe1bf 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSHeader.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsHeader.java
@@ -28,23 +28,23 @@ import static java.util.Objects.requireNonNull;
/**
* AMS Header 32 bytes The AMS/TCP-Header contains the addresses of the transmitter and receiver. In addition the AMS error code , the ADS command Id and some other information.
*/
-public class AMSHeader implements ByteReadable {
+public class AmsHeader implements ByteReadable {
/**
- * This is the AMSNetId of the station, for which the packet is intended. Remarks see below.
+ * This is the AmsNetId of the station, for which the packet is intended. Remarks see below.
*/
- private final AMSNetId targetAmsNetId;
+ private final AmsNetId targetAmsNetId;
/**
- * This is the AMSPort of the station, for which the packet is intended.
+ * This is the AmsPort of the station, for which the packet is intended.
*/
- private final AMSPort targetAmsPort;
+ private final AmsPort targetAmsPort;
/**
- * This contains the AMSNetId of the station, from which the packet was sent.
+ * This contains the AmsNetId of the station, from which the packet was sent.
*/
- private final AMSNetId sourceAmsNetId;
+ private final AmsNetId sourceAmsNetId;
/**
- * This contains the AMSPort of the station, from which the packet was sent.
+ * This contains the AmsPort of the station, from which the packet was sent.
*/
- private final AMSPort sourceAmsPort;
+ private final AmsPort sourceAmsPort;
/**
* 2 bytes.
*/
@@ -61,7 +61,7 @@ public class AMSHeader implements ByteReadable {
/**
* 4 bytes AMS error number. See ADS Return Codes.
*/
- private final AMSError code;
+ private final AmsError code;
/**
* 4 bytes Free usable 32 bit array. Usually this array serves to send an Id. This Id makes is possible to assign a received response to a request, which was sent before.
@@ -70,7 +70,7 @@ public class AMSHeader implements ByteReadable {
private final LengthSupplier dataLengthSupplier;
- private AMSHeader(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AMSError code, Invoke invokeId) {
+ private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
this.targetAmsNetId = requireNonNull(targetAmsNetId);
this.targetAmsPort = requireNonNull(targetAmsPort);
this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
@@ -84,7 +84,7 @@ public class AMSHeader implements ByteReadable {
}
- private AMSHeader(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AMSError code, Invoke invokeId) {
+ private AmsHeader(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
this.targetAmsNetId = requireNonNull(targetAmsNetId);
this.targetAmsPort = requireNonNull(targetAmsPort);
this.sourceAmsNetId = requireNonNull(sourceAmsNetId);
@@ -97,12 +97,12 @@ public class AMSHeader implements ByteReadable {
this.dataLengthSupplier = requireNonNull(dataLengthSupplier);
}
- public static AMSHeader of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AMSError code, Invoke invokeId) {
- return new AMSHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLength, code, invokeId);
+ public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, DataLength dataLength, AmsError code, Invoke invokeId) {
+ return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLength, code, invokeId);
}
- public static AMSHeader of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AMSError code, Invoke invokeId) {
- return new AMSHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLengthSupplier, code, invokeId);
+ public static AmsHeader of(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, Command commandId, State stateFlags, LengthSupplier dataLengthSupplier, AmsError code, Invoke invokeId) {
+ return new AmsHeader(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateFlags, dataLengthSupplier, code, invokeId);
}
@Override
@@ -119,19 +119,19 @@ public class AMSHeader implements ByteReadable {
invokeId);
}
- public AMSNetId getTargetAmsNetId() {
+ public AmsNetId getTargetAmsNetId() {
return targetAmsNetId;
}
- public AMSPort getTargetAmsPort() {
+ public AmsPort getTargetAmsPort() {
return targetAmsPort;
}
- public AMSNetId getSourceAmsNetId() {
+ public AmsNetId getSourceAmsNetId() {
return sourceAmsNetId;
}
- public AMSPort getSourceAmsPort() {
+ public AmsPort getSourceAmsPort() {
return sourceAmsPort;
}
@@ -147,7 +147,7 @@ public class AMSHeader implements ByteReadable {
return dataLengthSupplier == null ? dataLength : DataLength.of(dataLengthSupplier);
}
- public AMSError getCode() {
+ public AmsError getCode() {
return code;
}
@@ -159,10 +159,10 @@ public class AMSHeader implements ByteReadable {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof AMSHeader))
+ if (!(o instanceof AmsHeader))
return false;
- AMSHeader amsHeader = (AMSHeader) o;
+ AmsHeader amsHeader = (AmsHeader) o;
if (!targetAmsNetId.equals(amsHeader.targetAmsNetId))
return false;
@@ -181,7 +181,7 @@ public class AMSHeader implements ByteReadable {
if (!invokeId.equals(amsHeader.invokeId))
return false;
- return getDataLength().equals(((AMSHeader) o).getDataLength());
+ return getDataLength().equals(((AmsHeader) o).getDataLength());
}
@Override
@@ -200,7 +200,7 @@ public class AMSHeader implements ByteReadable {
@Override
public String toString() {
- return "AMSHeader{" +
+ return "AmsHeader{" +
"targetAmsNetId=" + targetAmsNetId +
", targetAmsPort=" + targetAmsPort +
", sourceAmsNetId=" + sourceAmsNetId +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSPacket.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
similarity index 64%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSPacket.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
index 37c48e0..1ff6537 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSPacket.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AmsPacket.java
@@ -19,55 +19,55 @@
package org.apache.plc4x.java.ads.api.generic;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.commands.ADSCommandType;
+import org.apache.plc4x.java.ads.api.commands.AdsCommandType;
import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.api.serial.AMSSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
import org.apache.plc4x.java.ads.api.serial.types.FragmentNumber;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
import org.apache.plc4x.java.ads.api.util.ByteReadable;
import static java.util.Objects.requireNonNull;
-public abstract class AMSPacket implements ByteReadable {
+public abstract class AmsPacket implements ByteReadable {
- protected final AMSHeader amsHeader;
+ protected final AmsHeader amsHeader;
- protected AMSPacket(AMSHeader amsHeader) {
+ protected AmsPacket(AmsHeader amsHeader) {
this.amsHeader = amsHeader;
}
- protected AMSPacket(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId) {
- if (!getClass().isAnnotationPresent(ADSCommandType.class)) {
- throw new IllegalArgumentException(ADSCommandType.class + " need to be present.");
+ protected AmsPacket(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort, State stateId, Invoke invokeId) {
+ if (!getClass().isAnnotationPresent(AdsCommandType.class)) {
+ throw new IllegalArgumentException(AdsCommandType.class + " need to be present.");
}
- this.amsHeader = AMSHeader.of(
+ this.amsHeader = AmsHeader.of(
requireNonNull(targetAmsNetId),
requireNonNull(targetAmsPort),
requireNonNull(sourceAmsNetId),
requireNonNull(sourceAmsPort),
- requireNonNull(getClass().getAnnotation(ADSCommandType.class).value()),
+ requireNonNull(getClass().getAnnotation(AdsCommandType.class).value()),
requireNonNull(stateId),
() -> getAdsData().getCalculatedLength(),
- requireNonNull(AMSError.NONE),
+ requireNonNull(AmsError.NONE),
requireNonNull(invokeId));
}
- public AMSHeader getAmsHeader() {
+ public AmsHeader getAmsHeader() {
return amsHeader;
}
- public abstract ADSData getAdsData();
+ public abstract AdsData getAdsData();
- protected ADSData buildADSData(ByteReadable... byteReadables) {
+ protected AdsData buildADSData(ByteReadable... byteReadables) {
return () -> buildByteBuff(byteReadables);
}
- public AMSTCPPacket toAmstcpPacket() {
- return AMSTCPPacket.of(this);
+ public AmsTCPPacket toAmstcpPacket() {
+ return AmsTCPPacket.of(this);
}
- public AMSSerialFrame toAmsSerialFrame(byte fragmentNumber) {
- return AMSSerialFrame.of(FragmentNumber.of(fragmentNumber), this);
+ public AmsSerialFrame toAmsSerialFrame(byte fragmentNumber) {
+ return AmsSerialFrame.of(FragmentNumber.of(fragmentNumber), this);
}
@Override
@@ -78,9 +78,9 @@ public abstract class AMSPacket implements ByteReadable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!(o instanceof AMSPacket)) return false;
+ if (!(o instanceof AmsPacket)) return false;
- AMSPacket amsPacket = (AMSPacket) o;
+ AmsPacket amsPacket = (AmsPacket) o;
return amsHeader.equals(amsPacket.amsHeader);
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSError.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
similarity index 70%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSError.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
index ae7228e..9a41994 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSError.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsError.java
@@ -22,38 +22,38 @@ import io.netty.buffer.ByteBuf;
import org.apache.plc4x.java.ads.api.commands.types.AdsReturnCode;
import org.apache.plc4x.java.ads.api.util.UnsignedIntLEByteValue;
-public class AMSError extends UnsignedIntLEByteValue {
+public class AmsError extends UnsignedIntLEByteValue {
public static final int NUM_BYTES = UnsignedIntLEByteValue.UNSIGNED_INT_LE_NUM_BYTES;
- public static final AMSError NONE = of(0);
+ public static final AmsError NONE = of(0);
- private AMSError(byte... values) {
+ private AmsError(byte... values) {
super(values);
}
- private AMSError(long value) {
+ private AmsError(long value) {
super(value);
}
- private AMSError(ByteBuf byteBuf) {
+ private AmsError(ByteBuf byteBuf) {
super(byteBuf);
}
- public static AMSError of(byte... values) {
- return new AMSError(values);
+ public static AmsError of(byte... values) {
+ return new AmsError(values);
}
- public static AMSError of(long errorCode) {
- return new AMSError(errorCode);
+ public static AmsError of(long errorCode) {
+ return new AmsError(errorCode);
}
- public static AMSError of(String errorCode) {
+ public static AmsError of(String errorCode) {
return of(Long.parseLong(errorCode));
}
- public static AMSError of(ByteBuf byteBuf) {
- return new AMSError(byteBuf);
+ public static AmsError of(ByteBuf byteBuf) {
+ return new AmsError(byteBuf);
}
private AdsReturnCode toAdsReturnCode() {
@@ -62,6 +62,6 @@ public class AMSError extends UnsignedIntLEByteValue {
@Override
public String toString() {
- return "AMSError{" + toAdsReturnCode() + "}";
+ return "AmsError{" + toAdsReturnCode() + "}";
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetId.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
similarity index 82%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetId.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
index 585ba8a..c6e7aff 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetId.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetId.java
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
* extension of the TCP/IP address and identifies a TwinCAT message router, e.g. "172.1.2.16.1.1". TwinCAT message
* routers exist on every TwinCAT PC, and on every Beckhoff BCxxxx bus controller (e.g. BC3100, BC8100, BC9000, ...).
* <p>
- * The AMSNetId consists of 6 bytes and addresses the transmitter or receiver. One possible AMSNetId would be e.g.
+ * The AmsNetId consists of 6 bytes and addresses the transmitter or receiver. One possible AmsNetId would be e.g.
* "172.16.17.10.1.1". The storage arrangement in this example is as follows:
* <p>
* _____0 1 2 3 4 5
@@ -41,42 +41,42 @@ import java.util.stream.Stream;
* 0 | 127 | 16 | 17 | 10 | 1 | 1 |
* __+-----------------------------------+
* <p>
- * The AMSNetId is purely logical and has usually no relation to the IP address. The AMSNetId is configured at the
+ * The AmsNetId is purely logical and has usually no relation to the IP address. The AmsNetId is configured at the
* target system. At the PC for this the TwinCAT System Control is used. If you use other hardware, see the considering
* documentation for notes about settings of the AMS NetId.
*
* @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
*/
-public class AMSNetId extends ByteValue {
+public class AmsNetId extends ByteValue {
public static final Pattern AMS_NET_ID_PATTERN =
Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
public static final int NUM_BYTES = 6;
- private AMSNetId(byte... values) {
+ private AmsNetId(byte... values) {
super(values);
assertLength(NUM_BYTES);
}
- public static AMSNetId of(byte... values) {
- return new AMSNetId(values);
+ public static AmsNetId of(byte... values) {
+ return new AmsNetId(values);
}
- public static AMSNetId of(int octed1, int octed2, int octed3, int octed4, int octed5, int octed6) {
- return new AMSNetId((byte) octed1, (byte) octed2, (byte) octed3, (byte) octed4, (byte) octed5, (byte) octed6);
+ public static AmsNetId of(int octed1, int octed2, int octed3, int octed4, int octed5, int octed6) {
+ return new AmsNetId((byte) octed1, (byte) octed2, (byte) octed3, (byte) octed4, (byte) octed5, (byte) octed6);
}
- public static AMSNetId of(String address) {
+ public static AmsNetId of(String address) {
if (!AMS_NET_ID_PATTERN.matcher(address).matches()) {
throw new IllegalArgumentException(address + " must match " + AMS_NET_ID_PATTERN);
}
String[] split = address.split("\\.");
byte[] bytes = ArrayUtils.toPrimitive(Stream.of(split).map(Integer::parseInt).map(Integer::byteValue).toArray(Byte[]::new));
- return new AMSNetId(bytes);
+ return new AmsNetId(bytes);
}
- public static AMSNetId of(ByteBuf byteBuf) {
+ public static AmsNetId of(ByteBuf byteBuf) {
byte[] values = new byte[NUM_BYTES];
byteBuf.readBytes(values);
return of(values);
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSPort.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
similarity index 72%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSPort.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
index 9c0f071..77ac13f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AMSPort.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/AmsPort.java
@@ -29,38 +29,38 @@ import java.util.regex.Pattern;
*
* @see <a href="https://infosys.beckhoff.com/content/1033/tcadscommon/html/tcadscommon_identadsdevice.htm?id=3991659524769593444">ADS device identification</a>
*/
-public class AMSPort extends ByteValue {
+public class AmsPort extends ByteValue {
public static final Pattern AMS_PORT_PATTERN = Pattern.compile("\\d+");
public static final int NUM_BYTES = 2;
- private AMSPort(byte... value) {
+ private AmsPort(byte... value) {
super(value);
assertLength(NUM_BYTES);
}
- public static AMSPort of(byte... values) {
- return new AMSPort(values);
+ public static AmsPort of(byte... values) {
+ return new AmsPort(values);
}
- public static AMSPort of(int port) {
+ public static AmsPort of(int port) {
checkUnsignedBounds(port, NUM_BYTES);
- return new AMSPort(ByteBuffer.allocate(NUM_BYTES)
+ return new AmsPort(ByteBuffer.allocate(NUM_BYTES)
// LE
.put((byte) (port & 0xff))
.put((byte) (port >> 8 & 0xff))
.array());
}
- public static AMSPort of(String port) {
+ public static AmsPort of(String port) {
if (!AMS_PORT_PATTERN.matcher(port).matches()) {
throw new IllegalArgumentException(port + " must match " + AMS_PORT_PATTERN);
}
return of(Integer.parseInt(port));
}
- public static AMSPort of(ByteBuf byteBuf) {
+ public static AmsPort of(ByteBuf byteBuf) {
return of(byteBuf.readUnsignedShortLE());
}
@@ -78,57 +78,57 @@ public class AMSPort extends ByteValue {
/**
* Logger (only NT-Log)
*/
- public static final AMSPort logger = AMSPort.of(100);
+ public static final AmsPort logger = AmsPort.of(100);
/**
* Eventlogger
*/
- public static final AMSPort eventLogger = AMSPort.of(110);
+ public static final AmsPort eventLogger = AmsPort.of(110);
/**
* IO
*/
- public static final AMSPort io = AMSPort.of(300);
+ public static final AmsPort io = AmsPort.of(300);
/**
* additional Task 1
*/
- public static final AMSPort additionalTask1 = AMSPort.of(301);
+ public static final AmsPort additionalTask1 = AmsPort.of(301);
/**
* additional Task 2
*/
- public static final AMSPort additionalTask2 = AMSPort.of(302);
+ public static final AmsPort additionalTask2 = AmsPort.of(302);
/**
* NC
*/
- public static final AMSPort nc = AMSPort.of(500);
+ public static final AmsPort nc = AmsPort.of(500);
/**
* PLC RuntimeSystem 1
*/
- public static final AMSPort plcRuntimeSystem1 = AMSPort.of(801);
+ public static final AmsPort plcRuntimeSystem1 = AmsPort.of(801);
/**
* PLC RuntimeSystem 2
*/
- public static final AMSPort plcRuntimeSystem2 = AMSPort.of(811);
+ public static final AmsPort plcRuntimeSystem2 = AmsPort.of(811);
/**
* PLC RuntimeSystem 3
*/
- public static final AMSPort plcRuntimeSystem3 = AMSPort.of(821);
+ public static final AmsPort plcRuntimeSystem3 = AmsPort.of(821);
/**
* PLC RuntimeSystem 4
*/
- public static final AMSPort plcRuntimeSystem4 = AMSPort.of(831);
+ public static final AmsPort plcRuntimeSystem4 = AmsPort.of(831);
/**
* Camshaft controller
*/
- public static final AMSPort camShaftController = AMSPort.of(900);
+ public static final AmsPort camShaftController = AmsPort.of(900);
/**
* System Service
*/
- public static final AMSPort systemService = AMSPort.of(900);
+ public static final AmsPort systemService = AmsPort.of(900);
/**
* Scope
*/
- public static final AMSPort scope = AMSPort.of(900);
+ public static final AmsPort scope = AmsPort.of(900);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialAcknowledgeFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
similarity index 90%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialAcknowledgeFrame.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
index e1663c5..812eb1b 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialAcknowledgeFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
@@ -32,7 +32,7 @@ import java.security.NoSuchAlgorithmException;
*
* @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
*/
-public class AMSSerialAcknowledgeFrame implements ByteReadable {
+public class AmsSerialAcknowledgeFrame implements ByteReadable {
public static final int ID = 0x5A01;
@@ -67,7 +67,7 @@ public class AMSSerialAcknowledgeFrame implements ByteReadable {
private final CRC crc;
- private AMSSerialAcknowledgeFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+ private AmsSerialAcknowledgeFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
this.magicCookie = magicCookie;
this.transmitterAddress = transmitterAddress;
this.receiverAddress = receiverAddress;
@@ -76,7 +76,7 @@ public class AMSSerialAcknowledgeFrame implements ByteReadable {
this.crc = crc;
}
- private AMSSerialAcknowledgeFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+ private AmsSerialAcknowledgeFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
this.magicCookie = MagicCookie.of(ID);
this.transmitterAddress = transmitterAddress;
this.receiverAddress = receiverAddress;
@@ -99,12 +99,12 @@ public class AMSSerialAcknowledgeFrame implements ByteReadable {
this.crc = CRC.of(digest[0], digest[1]);
}
- public static AMSSerialAcknowledgeFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
- return new AMSSerialAcknowledgeFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+ public static AmsSerialAcknowledgeFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+ return new AmsSerialAcknowledgeFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
}
- public static AMSSerialAcknowledgeFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
- return new AMSSerialAcknowledgeFrame(transmitterAddress, receiverAddress, fragmentNumber);
+ public static AmsSerialAcknowledgeFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+ return new AmsSerialAcknowledgeFrame(transmitterAddress, receiverAddress, fragmentNumber);
}
@Override
@@ -115,9 +115,9 @@ public class AMSSerialAcknowledgeFrame implements ByteReadable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!(o instanceof AMSSerialAcknowledgeFrame)) return false;
+ if (!(o instanceof AmsSerialAcknowledgeFrame)) return false;
- AMSSerialAcknowledgeFrame that = (AMSSerialAcknowledgeFrame) o;
+ AmsSerialAcknowledgeFrame that = (AmsSerialAcknowledgeFrame) o;
if (!magicCookie.equals(that.magicCookie)) return false;
if (!transmitterAddress.equals(that.transmitterAddress)) return false;
@@ -140,7 +140,7 @@ public class AMSSerialAcknowledgeFrame implements ByteReadable {
@Override
public String toString() {
- return "AMSSerialAcknowledgeFrame{" +
+ return "AmsSerialAcknowledgeFrame{" +
"magicCookie=" + magicCookie +
", transmitterAddress=" + transmitterAddress +
", receiverAddress=" + receiverAddress +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
similarity index 89%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
index aa9e3fd..c90b042 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
@@ -19,7 +19,7 @@
package org.apache.plc4x.java.ads.api.serial;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
import org.apache.plc4x.java.ads.api.serial.types.*;
import org.apache.plc4x.java.ads.api.util.ByteReadable;
import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
@@ -35,7 +35,7 @@ import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
*
* @see <a href="https://infosys.beckhoff.com/content/1033/tcadsamsserialspec/html/tcamssericalspec_amsframe.htm?id=8115637053270715044">TwinCAT AMS via RS232 Specification</a>
*/
-public class AMSSerialFrame implements ByteReadable {
+public class AmsSerialFrame implements ByteReadable {
public static final int ID = 0xA501;
@@ -71,12 +71,12 @@ public class AMSSerialFrame implements ByteReadable {
/**
* The AMS packet to be sent.
*/
- private AMSPacket amsPacket;
+ private AmsPacket amsPacket;
private final UserData userData;
private final CRC crc;
- private AMSSerialFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
+ private AmsSerialFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
this.magicCookie = magicCookie;
this.transmitterAddress = transmitterAddress;
this.receiverAddress = receiverAddress;
@@ -86,7 +86,7 @@ public class AMSSerialFrame implements ByteReadable {
this.crc = crc;
}
- private AMSSerialFrame(FragmentNumber fragmentNumber, AMSPacket amsPacket) {
+ private AmsSerialFrame(FragmentNumber fragmentNumber, AmsPacket amsPacket) {
this.magicCookie = MagicCookie.of(ID);
this.transmitterAddress = TransmitterAddress.RS232_COMM_ADDRESS;
this.receiverAddress = ReceiverAddress.RS232_COMM_ADDRESS;
@@ -102,15 +102,15 @@ public class AMSSerialFrame implements ByteReadable {
this.crc = CRC.of(DigestUtil.calculateCrc16(() -> buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData)));
}
- public static AMSSerialFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
- return new AMSSerialFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
+ public static AmsSerialFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
+ return new AmsSerialFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData, crc);
}
- public static AMSSerialFrame of(FragmentNumber fragmentNumber, AMSPacket amsPacket) {
- return new AMSSerialFrame(fragmentNumber, amsPacket);
+ public static AmsSerialFrame of(FragmentNumber fragmentNumber, AmsPacket amsPacket) {
+ return new AmsSerialFrame(fragmentNumber, amsPacket);
}
- public AMSPacket getAmsPacket() {
+ public AmsPacket getAmsPacket() {
return amsPacket;
}
@@ -122,9 +122,9 @@ public class AMSSerialFrame implements ByteReadable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!(o instanceof AMSSerialFrame)) return false;
+ if (!(o instanceof AmsSerialFrame)) return false;
- AMSSerialFrame that = (AMSSerialFrame) o;
+ AmsSerialFrame that = (AmsSerialFrame) o;
if (!magicCookie.equals(that.magicCookie)) return false;
if (!transmitterAddress.equals(that.transmitterAddress)) return false;
@@ -151,7 +151,7 @@ public class AMSSerialFrame implements ByteReadable {
@Override
public String toString() {
- return "AMSSerialFrame{" +
+ return "AmsSerialFrame{" +
"magicCookie=" + magicCookie +
", transmitterAddress=" + transmitterAddress +
", receiverAddress=" + receiverAddress +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialResetFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
similarity index 90%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialResetFrame.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
index 30da46e..b05f023 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialResetFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
@@ -31,7 +31,7 @@ import java.security.NoSuchAlgorithmException;
* sent. In this way the receiver is informed that a new communication is running and the receiver then accepts the
* fragment number during the next AMS-Frame, without carrying out a check.
*/
-public class AMSSerialResetFrame implements ByteReadable {
+public class AmsSerialResetFrame implements ByteReadable {
public static final int ID = 0xA503;
@@ -66,7 +66,7 @@ public class AMSSerialResetFrame implements ByteReadable {
private final CRC crc;
- private AMSSerialResetFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+ private AmsSerialResetFrame(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
this.magicCookie = magicCookie;
this.transmitterAddress = transmitterAddress;
this.receiverAddress = receiverAddress;
@@ -75,7 +75,7 @@ public class AMSSerialResetFrame implements ByteReadable {
this.crc = crc;
}
- private AMSSerialResetFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+ private AmsSerialResetFrame(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
this.magicCookie = MagicCookie.of(ID);
this.transmitterAddress = transmitterAddress;
this.receiverAddress = receiverAddress;
@@ -98,12 +98,12 @@ public class AMSSerialResetFrame implements ByteReadable {
this.crc = CRC.of(digest[0], digest[1]);
}
- public static AMSSerialResetFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
- return new AMSSerialResetFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+ public static AmsSerialResetFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
+ return new AmsSerialResetFrame(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
}
- public static AMSSerialResetFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
- return new AMSSerialResetFrame(transmitterAddress, receiverAddress, fragmentNumber);
+ public static AmsSerialResetFrame of(TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber) {
+ return new AmsSerialResetFrame(transmitterAddress, receiverAddress, fragmentNumber);
}
@Override
@@ -114,9 +114,9 @@ public class AMSSerialResetFrame implements ByteReadable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!(o instanceof AMSSerialResetFrame)) return false;
+ if (!(o instanceof AmsSerialResetFrame)) return false;
- AMSSerialResetFrame that = (AMSSerialResetFrame) o;
+ AmsSerialResetFrame that = (AmsSerialResetFrame) o;
if (!magicCookie.equals(that.magicCookie)) return false;
if (!transmitterAddress.equals(that.transmitterAddress)) return false;
@@ -139,7 +139,7 @@ public class AMSSerialResetFrame implements ByteReadable {
@Override
public String toString() {
- return "AMSSerialResetFrame{" +
+ return "AmsSerialResetFrame{" +
"magicCookie=" + magicCookie +
", transmitterAddress=" + transmitterAddress +
", receiverAddress=" + receiverAddress +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPPacket.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
similarity index 68%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPPacket.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
index d56acf5..243852e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPPacket.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTCPPacket.java
@@ -19,43 +19,43 @@
package org.apache.plc4x.java.ads.api.tcp;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.ads.api.generic.ADSData;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.AdsData;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
import org.apache.plc4x.java.ads.api.util.ByteReadable;
import static java.util.Objects.requireNonNull;
-public class AMSTCPPacket implements ByteReadable {
- private final AMSTCPHeader amsTcpHeader;
+public class AmsTCPPacket implements ByteReadable {
+ private final AmsTcpHeader amsTcpHeader;
- private final AMSPacket amsPacket;
+ private final AmsPacket amsPacket;
- private AMSTCPPacket(AMSTCPHeader amsTcpHeader, AMSPacket amsPacket) {
+ private AmsTCPPacket(AmsTcpHeader amsTcpHeader, AmsPacket amsPacket) {
this.amsTcpHeader = requireNonNull(amsTcpHeader);
this.amsPacket = amsPacket;
}
- private AMSTCPPacket(AMSPacket amsPacket) {
+ private AmsTCPPacket(AmsPacket amsPacket) {
this.amsPacket = amsPacket;
// It is important that we wrap the ads data call as this will initialized in the constructor
// so this value will be null if we call adsData now.
- this.amsTcpHeader = AMSTCPHeader.of(requireNonNull(amsPacket.getAmsHeader()), () -> getAdsData().getCalculatedLength());
+ this.amsTcpHeader = AmsTcpHeader.of(requireNonNull(amsPacket.getAmsHeader()), () -> getAdsData().getCalculatedLength());
}
- public AMSTCPHeader getAmsTcpHeader() {
+ public AmsTcpHeader getAmsTcpHeader() {
return amsTcpHeader;
}
- public AMSPacket getAmsPacket() {
+ public AmsPacket getAmsPacket() {
return amsPacket;
}
- public AMSHeader getAmsHeader() {
+ public AmsHeader getAmsHeader() {
return amsPacket.getAmsHeader();
}
- public ADSData getAdsData() {
+ public AdsData getAdsData() {
return amsPacket.getAdsData();
}
@@ -64,20 +64,20 @@ public class AMSTCPPacket implements ByteReadable {
return buildByteBuff(amsTcpHeader, amsPacket);
}
- public static AMSTCPPacket of(AMSTCPHeader amsTcpHeader, AMSPacket amsPacket) {
- return new AMSTCPPacket(amsTcpHeader, amsPacket);
+ public static AmsTCPPacket of(AmsTcpHeader amsTcpHeader, AmsPacket amsPacket) {
+ return new AmsTCPPacket(amsTcpHeader, amsPacket);
}
- public static AMSTCPPacket of(AMSPacket amsPacket) {
- return new AMSTCPPacket(amsPacket);
+ public static AmsTCPPacket of(AmsPacket amsPacket) {
+ return new AmsTCPPacket(amsPacket);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!(o instanceof AMSTCPPacket)) return false;
+ if (!(o instanceof AmsTCPPacket)) return false;
- AMSTCPPacket that = (AMSTCPPacket) o;
+ AmsTCPPacket that = (AmsTCPPacket) o;
if (!amsTcpHeader.equals(that.amsTcpHeader)) return false;
return amsPacket.equals(that.amsPacket);
@@ -92,7 +92,7 @@ public class AMSTCPPacket implements ByteReadable {
@Override
public String toString() {
- return "AMSTCPPacket{" +
+ return "AmsTCPPacket{" +
"amsTcpHeader=" + amsTcpHeader +
", amsPacket=" + amsPacket +
'}';
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPHeader.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
similarity index 85%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPHeader.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
index 33e01f9..2dd97da 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AMSTCPHeader.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/tcp/AmsTcpHeader.java
@@ -29,7 +29,7 @@ import static java.util.Objects.requireNonNull;
/**
* AMS/TCP Header 6 bytes contains the tcpLength of the data packet.
*/
-public class AMSTCPHeader implements ByteReadable {
+public class AmsTcpHeader implements ByteReadable {
/**
* These bytes must be set to 0.
@@ -48,28 +48,28 @@ public class AMSTCPHeader implements ByteReadable {
*/
private final LengthSupplier[] lengthSuppliers;
- private AMSTCPHeader(TcpLength tcpLength) {
+ private AmsTcpHeader(TcpLength tcpLength) {
this.reserved = Reserved.CONSTANT;
this.tcpLength = requireNonNull(tcpLength);
this.lengthSuppliers = null;
}
- private AMSTCPHeader(LengthSupplier... lengthSuppliers) {
+ private AmsTcpHeader(LengthSupplier... lengthSuppliers) {
this.reserved = Reserved.CONSTANT;
this.tcpLength = null;
this.lengthSuppliers = requireNonNull(lengthSuppliers);
}
- public static AMSTCPHeader of(TcpLength tcpLength) {
- return new AMSTCPHeader(tcpLength);
+ public static AmsTcpHeader of(TcpLength tcpLength) {
+ return new AmsTcpHeader(tcpLength);
}
- public static AMSTCPHeader of(long length) {
- return new AMSTCPHeader(TcpLength.of(length));
+ public static AmsTcpHeader of(long length) {
+ return new AmsTcpHeader(TcpLength.of(length));
}
- public static AMSTCPHeader of(LengthSupplier... lengthSuppliers) {
- return new AMSTCPHeader(lengthSuppliers);
+ public static AmsTcpHeader of(LengthSupplier... lengthSuppliers) {
+ return new AmsTcpHeader(lengthSuppliers);
}
public TcpLength getTcpLength() {
@@ -114,10 +114,10 @@ public class AMSTCPHeader implements ByteReadable {
public boolean equals(Object o) {
if (this == o)
return true;
- if (!(o instanceof AMSTCPHeader))
+ if (!(o instanceof AmsTcpHeader))
return false;
- AMSTCPHeader that = (AMSTCPHeader) o;
+ AmsTcpHeader that = (AmsTcpHeader) o;
return getTcpLength().equals(that.getTcpLength());
}
@@ -131,7 +131,7 @@ public class AMSTCPHeader implements ByteReadable {
@Override
public String toString() {
- return "AMSTCPHeader{" +
+ return "AmsTcpHeader{" +
"reserved=" + reserved +
", tcpLength=" + getTcpLength() +
'}';
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
similarity index 69%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSAbstractPlcConnection.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index ca60188..194197e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -18,9 +18,9 @@
*/
package org.apache.plc4x.java.ads.connection;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
-import org.apache.plc4x.java.ads.model.ADSAddress;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.model.AdsAddress;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcException;
@@ -31,21 +31,21 @@ import org.apache.plc4x.java.base.connection.ChannelFactory;
import java.util.concurrent.CompletableFuture;
-public abstract class ADSAbstractPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter {
+public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter {
- protected final AMSNetId targetAmsNetId;
+ protected final AmsNetId targetAmsNetId;
- protected final AMSPort targetAmsPort;
+ protected final AmsPort targetAmsPort;
- protected final AMSNetId sourceAmsNetId;
+ protected final AmsNetId sourceAmsNetId;
- protected final AMSPort sourceAmsPort;
+ protected final AmsPort sourceAmsPort;
- protected ADSAbstractPlcConnection(ChannelFactory channelFactory, AMSNetId targetAmsNetId, AMSPort targetAmsPort) {
+ protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
this(channelFactory, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
}
- protected ADSAbstractPlcConnection(ChannelFactory channelFactory, AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort) {
+ protected AdsAbstractPlcConnection(ChannelFactory channelFactory, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
super(channelFactory);
this.targetAmsNetId = targetAmsNetId;
this.targetAmsPort = targetAmsPort;
@@ -53,26 +53,26 @@ public abstract class ADSAbstractPlcConnection extends AbstractPlcConnection imp
this.sourceAmsPort = sourceAmsPort;
}
- public AMSNetId getTargetAmsNetId() {
+ public AmsNetId getTargetAmsNetId() {
return targetAmsNetId;
}
- public AMSPort getTargetAmsPort() {
+ public AmsPort getTargetAmsPort() {
return targetAmsPort;
}
- public AMSNetId getSourceAmsNetId() {
+ public AmsNetId getSourceAmsNetId() {
return sourceAmsNetId;
}
- public AMSPort getSourceAmsPort() {
+ public AmsPort getSourceAmsPort() {
return sourceAmsPort;
}
@Override
public Address parseAddress(String addressString) throws PlcException {
- return ADSAddress.of(addressString);
+ return AdsAddress.of(addressString);
}
@Override
@@ -89,12 +89,12 @@ public abstract class ADSAbstractPlcConnection extends AbstractPlcConnection imp
return writeFuture;
}
- protected static AMSNetId generateAMSNetId() {
- return AMSNetId.of("0.0.0.0.0.0");
+ protected static AmsNetId generateAMSNetId() {
+ return AmsNetId.of("0.0.0.0.0.0");
}
- protected static AMSPort generateAMSPort() {
- return AMSPort.of(0);
+ protected static AmsPort generateAMSPort() {
+ return AmsPort.of(0);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSSerialPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
similarity index 72%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSSerialPlcConnection.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
index 80b282a..13d14e2 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSSerialPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
@@ -22,21 +22,21 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
-import org.apache.plc4x.java.ads.protocol.ADS2SerialProtocol;
-import org.apache.plc4x.java.ads.protocol.Plc4X2ADSProtocol;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.protocol.Ads2SerialProtocol;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
import org.apache.plc4x.java.base.connection.SerialChannelFactory;
import java.util.concurrent.CompletableFuture;
-public class ADSSerialPlcConnection extends ADSAbstractPlcConnection {
+public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
- public ADSSerialPlcConnection(String serialPort, AMSNetId targetAmsNetId, AMSPort targetAmsPort) {
+ public AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
this(serialPort, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
}
- public ADSSerialPlcConnection(String serialPort, AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort) {
+ public AdsSerialPlcConnection(String serialPort, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
super(new SerialChannelFactory(serialPort), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
}
@@ -47,8 +47,8 @@ public class ADSSerialPlcConnection extends ADSAbstractPlcConnection {
protected void initChannel(Channel channel) {
// Build the protocol stack for communicating with the ads protocol.
ChannelPipeline pipeline = channel.pipeline();
- pipeline.addLast(new Plc4X2ADSProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
- pipeline.addLast(new ADS2SerialProtocol());
+ pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
+ pipeline.addLast(new Ads2SerialProtocol());
}
};
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
similarity index 67%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnection.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 3c4f2e7..47a9f10 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -22,32 +22,32 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
-import org.apache.plc4x.java.ads.protocol.ADS2TcpProtocol;
-import org.apache.plc4x.java.ads.protocol.Plc4X2ADSProtocol;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.protocol.Ads2TcpProtocol;
+import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
import java.net.InetAddress;
import java.util.concurrent.CompletableFuture;
-public class ADSTcpPlcConnection extends ADSAbstractPlcConnection {
+public class AdsTcpPlcConnection extends AdsAbstractPlcConnection {
private static final int TCP_PORT = 48898;
- public ADSTcpPlcConnection(InetAddress address, AMSNetId targetAmsNetId, AMSPort targetAmsPort) {
+ public AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
this(address, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
}
- public ADSTcpPlcConnection(InetAddress address, Integer port, AMSNetId targetAmsNetId, AMSPort targetAmsPort) {
+ public AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort) {
this(address, port, targetAmsNetId, targetAmsPort, generateAMSNetId(), generateAMSPort());
}
- public ADSTcpPlcConnection(InetAddress address, AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort) {
+ public AdsTcpPlcConnection(InetAddress address, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
this(address, null, targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
}
- public ADSTcpPlcConnection(InetAddress address, Integer port, AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort) {
+ public AdsTcpPlcConnection(InetAddress address, Integer port, AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
super(new TcpSocketChannelFactory(address, port != null ? port : TCP_PORT), targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
}
@@ -58,14 +58,14 @@ public class ADSTcpPlcConnection extends ADSAbstractPlcConnection {
protected void initChannel(Channel channel) {
// Build the protocol stack for communicating with the ads protocol.
ChannelPipeline pipeline = channel.pipeline();
- pipeline.addLast(new Plc4X2ADSProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
- pipeline.addLast(new ADS2TcpProtocol());
+ pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort));
+ pipeline.addLast(new Ads2TcpProtocol());
}
};
}
- protected static AMSPort generateAMSPort() {
- return AMSPort.of(TCP_PORT);
+ protected static AmsPort generateAMSPort() {
+ return AmsPort.of(TCP_PORT);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/ADSAddress.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
similarity index 85%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/ADSAddress.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
index f41e0a8..d3a9b6c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/ADSAddress.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsAddress.java
@@ -24,25 +24,25 @@ import org.apache.plc4x.java.api.model.Address;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class ADSAddress implements Address {
+public class AdsAddress implements Address {
private static final Pattern RESSOURCE_ADDRESS_PATTERN = Pattern.compile("^(?<indexGroup>\\d+)/(?<indexOffset>\\d+)");
private final long indexGroup;
private final long indexOffset;
- private ADSAddress(long indexGroup, long indexOffset) {
+ private AdsAddress(long indexGroup, long indexOffset) {
ByteValue.checkUnsignedBounds(indexGroup, 4);
this.indexGroup = indexGroup;
ByteValue.checkUnsignedBounds(indexOffset, 4);
this.indexOffset = indexOffset;
}
- public static ADSAddress of(long indexGroup, long indexOffset) {
- return new ADSAddress(indexGroup, indexOffset);
+ public static AdsAddress of(long indexGroup, long indexOffset) {
+ return new AdsAddress(indexGroup, indexOffset);
}
- public static ADSAddress of(String address) {
+ public static AdsAddress of(String address) {
Matcher matcher = RESSOURCE_ADDRESS_PATTERN.matcher(address);
if (!matcher.matches()) {
throw new IllegalArgumentException(
@@ -51,7 +51,7 @@ public class ADSAddress implements Address {
String indexGroup = matcher.group("indexGroup");
String indexOffset = matcher.group("indexOffset");
- return new ADSAddress(Long.parseLong(indexGroup), Long.parseLong(indexOffset));
+ return new AdsAddress(Long.parseLong(indexGroup), Long.parseLong(indexOffset));
}
public long getIndexGroup() {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
similarity index 77%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
index f75819d..2f32027 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
@@ -22,13 +22,13 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.serial.AMSSerialAcknowledgeFrame;
-import org.apache.plc4x.java.ads.api.serial.AMSSerialFrame;
-import org.apache.plc4x.java.ads.api.serial.AMSSerialResetFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialResetFrame;
import org.apache.plc4x.java.ads.api.serial.types.*;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPHeader;
+import org.apache.plc4x.java.ads.api.tcp.AmsTcpHeader;
import org.apache.plc4x.java.ads.protocol.util.DigestUtil;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.slf4j.Logger;
@@ -38,17 +38,17 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class ADS2SerialProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
+public class Ads2SerialProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket> {
- private static final Logger LOGGER = LoggerFactory.getLogger(ADS2TcpProtocol.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Ads2TcpProtocol.class);
- private final ConcurrentMap<Invoke, AMSPacket> requests;
+ private final ConcurrentMap<Invoke, AmsPacket> requests;
- private final ADS2TcpProtocol ads2TcpProtocol;
+ private final Ads2TcpProtocol ads2TcpProtocol;
- public ADS2SerialProtocol() {
+ public Ads2SerialProtocol() {
this.requests = new ConcurrentHashMap<>();
- this.ads2TcpProtocol = new ADS2TcpProtocol(true);
+ this.ads2TcpProtocol = new Ads2TcpProtocol(true);
}
/**
@@ -60,7 +60,7 @@ public class ADS2SerialProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket
@Override
- protected void encode(ChannelHandlerContext channelHandlerContext, AMSPacket amsPacket, List<Object> out) throws Exception {
+ protected void encode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) throws Exception {
Invoke invokeId = amsPacket.getAmsHeader().getInvokeId();
if (invokeId != Invoke.NONE) {
requests.put(invokeId, amsPacket);
@@ -88,20 +88,20 @@ public class ADS2SerialProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket
CRC crc = CRC.of(byteBuf);
switch (magicCookie.getAsInt()) {
- case AMSSerialFrame.ID:
+ case AmsSerialFrame.ID:
// This is a lazy implementation. we just reuse the tcp implementation
- ByteBuf fakeTcpHeader = AMSTCPHeader.of(0).getByteBuf();
+ ByteBuf fakeTcpHeader = AmsTcpHeader.of(0).getByteBuf();
ads2TcpProtocol.decode(channelHandlerContext, Unpooled.wrappedBuffer(fakeTcpHeader, userData.getByteBuf()), out);
- AMSPacket amsPacket = (AMSPacket) out.get(0);
- AMSSerialFrame amsSerialFrame = amsPacket.toAmsSerialFrame(fragmentNumber.getBytes()[0]);
+ AmsPacket amsPacket = (AmsPacket) out.get(0);
+ AmsSerialFrame amsSerialFrame = amsPacket.toAmsSerialFrame(fragmentNumber.getBytes()[0]);
LOGGER.debug("Ams Serial Frame received {}", amsSerialFrame);
break;
- case AMSSerialAcknowledgeFrame.ID:
- AMSSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AMSSerialAcknowledgeFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+ case AmsSerialAcknowledgeFrame.ID:
+ AmsSerialAcknowledgeFrame amsSerialAcknowledgeFrame = AmsSerialAcknowledgeFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
LOGGER.debug("Ams Serial ACK Frame received {}", amsSerialAcknowledgeFrame);
break;
- case AMSSerialResetFrame.ID:
- AMSSerialResetFrame amsSerialResetFrame = AMSSerialResetFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
+ case AmsSerialResetFrame.ID:
+ AmsSerialResetFrame amsSerialResetFrame = AmsSerialResetFrame.of(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, crc);
LOGGER.debug("Ams Serial Reset Frame received {}", amsSerialResetFrame);
break;
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
similarity index 77%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocol.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
index a38ee7e..5668b00 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
@@ -23,10 +23,10 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
import org.apache.plc4x.java.ads.api.commands.*;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
import org.apache.plc4x.java.ads.api.generic.types.*;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPHeader;
+import org.apache.plc4x.java.ads.api.tcp.AmsTcpHeader;
import org.apache.plc4x.java.ads.api.tcp.types.TcpLength;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,19 +37,19 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
+public class Ads2TcpProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket> {
- private static final Logger LOGGER = LoggerFactory.getLogger(ADS2TcpProtocol.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Ads2TcpProtocol.class);
- private final ConcurrentMap<Invoke, AMSPacket> requests;
+ private final ConcurrentMap<Invoke, AmsPacket> requests;
private final boolean ignoreBrokenPackages;
- public ADS2TcpProtocol() {
+ public Ads2TcpProtocol() {
this(false);
}
- public ADS2TcpProtocol(boolean ignoreBrokenPackages) {
+ public Ads2TcpProtocol(boolean ignoreBrokenPackages) {
this.requests = new ConcurrentHashMap<>();
this.ignoreBrokenPackages = ignoreBrokenPackages;
}
@@ -62,7 +62,7 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
}
@Override
- protected void encode(ChannelHandlerContext channelHandlerContext, AMSPacket amsPacket, List<Object> out) throws Exception {
+ protected void encode(ChannelHandlerContext channelHandlerContext, AmsPacket amsPacket, List<Object> out) throws Exception {
Invoke invokeId = amsPacket.getAmsHeader().getInvokeId();
if (invokeId != Invoke.NONE) {
requests.put(invokeId, amsPacket);
@@ -75,22 +75,22 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out) throws Exception {
// Tcp decoding
// Reserved
- byteBuf.skipBytes(AMSTCPHeader.Reserved.NUM_BYTES);
+ byteBuf.skipBytes(AmsTcpHeader.Reserved.NUM_BYTES);
TcpLength packetLength = TcpLength.of(byteBuf);
- AMSTCPHeader amstcpHeader = AMSTCPHeader.of(packetLength);
- LOGGER.debug("AMS TCP Header {}", amstcpHeader);
+ AmsTcpHeader amsTcpHeader = AmsTcpHeader.of(packetLength);
+ LOGGER.debug("AMS TCP Header {}", amsTcpHeader);
// Ams decoding
- AMSNetId targetAmsNetId = AMSNetId.of(byteBuf);
- AMSPort targetAmsPort = AMSPort.of(byteBuf);
- AMSNetId sourceAmsNetId = AMSNetId.of(byteBuf);
- AMSPort sourceAmsPort = AMSPort.of(byteBuf);
+ AmsNetId targetAmsNetId = AmsNetId.of(byteBuf);
+ AmsPort targetAmsPort = AmsPort.of(byteBuf);
+ AmsNetId sourceAmsNetId = AmsNetId.of(byteBuf);
+ AmsPort sourceAmsPort = AmsPort.of(byteBuf);
Command commandId = Command.of(byteBuf);
State stateId = State.of(byteBuf);
DataLength dataLength = DataLength.of(byteBuf);
- AMSError errorCode = AMSError.of(byteBuf);
+ AmsError errorCode = AmsError.of(byteBuf);
Invoke invoke = Invoke.of(byteBuf);
- AMSPacket correlatedamsPacket = requests.remove(invoke);
+ AmsPacket correlatedamsPacket = requests.remove(invoke);
if (correlatedamsPacket != null) {
LOGGER.debug("Correlated packet received {}", correlatedamsPacket);
}
@@ -99,8 +99,8 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
throw new IllegalStateException("Overflow in datalength: " + dataLength.getAsLong());
}
ByteBuf commandBuffer = byteBuf.readBytes((int) dataLength.getAsLong());
- AMSHeader amsHeader = AMSHeader.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateId, dataLength, errorCode, invoke);
- final AMSPacket amsPacket;
+ AmsHeader amsHeader = AmsHeader.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, commandId, stateId, dataLength, errorCode, invoke);
+ final AmsPacket amsPacket;
switch (commandId) {
case INVALID:
amsPacket = handleInvalidCommand(commandBuffer, amsHeader);
@@ -147,32 +147,32 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byteBuf.release();
}
- private AMSPacket handleInvalidCommand(ByteBuf commandBuffer, AMSHeader amsHeader) {
+ private AmsPacket handleInvalidCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
return UnknownCommand.of(amsHeader, commandBuffer);
}
- private AMSPacket handleADSReadDeviceInfoCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSReadDeviceInfoCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
- amsPacket = ADSReadDeviceInfoRequest.of(amsHeader);
+ amsPacket = AdsReadDeviceInfoRequest.of(amsHeader);
} else {
Result result = Result.of(commandBuffer);
MajorVersion majorVersion = MajorVersion.of(commandBuffer);
MinorVersion minorVersion = MinorVersion.of(commandBuffer);
Version version = Version.of(commandBuffer);
Device device = Device.of(commandBuffer);
- amsPacket = ADSReadDeviceInfoResponse.of(amsHeader, result, majorVersion, minorVersion, version, device);
+ amsPacket = AdsReadDeviceInfoResponse.of(amsHeader, result, majorVersion, minorVersion, version, device);
}
return amsPacket;
}
- private AMSPacket handleADSReadCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSReadCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
IndexGroup indexGroup = IndexGroup.of(commandBuffer);
IndexOffset indexOffset = IndexOffset.of(commandBuffer);
Length length = Length.of(commandBuffer);
- amsPacket = ADSReadRequest.of(amsHeader, indexGroup, indexOffset, length);
+ amsPacket = AdsReadRequest.of(amsHeader, indexGroup, indexOffset, length);
} else {
Result result = Result.of(commandBuffer);
Length length = Length.of(commandBuffer);
@@ -182,13 +182,13 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amsPacket = ADSReadResponse.of(amsHeader, result, length, data);
+ amsPacket = AdsReadResponse.of(amsHeader, result, length, data);
}
return amsPacket;
}
- private AMSPacket handleADSWriteCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
IndexGroup indexGroup = IndexGroup.of(commandBuffer);
IndexOffset indexOffset = IndexOffset.of(commandBuffer);
@@ -199,30 +199,30 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amsPacket = ADSWriteRequest.of(amsHeader, indexGroup, indexOffset, length, data);
+ amsPacket = AdsWriteRequest.of(amsHeader, indexGroup, indexOffset, length, data);
} else {
Result result = Result.of(commandBuffer);
- amsPacket = ADSWriteResponse.of(amsHeader, result);
+ amsPacket = AdsWriteResponse.of(amsHeader, result);
}
return amsPacket;
}
- private AMSPacket handleADSReadStateCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSReadStateCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
- amsPacket = ADSReadStateRequest.of(amsHeader);
+ amsPacket = AdsReadStateRequest.of(amsHeader);
} else {
Result result = Result.of(commandBuffer);
- amsPacket = ADSReadStateResponse.of(amsHeader, result);
+ amsPacket = AdsReadStateResponse.of(amsHeader, result);
}
return amsPacket;
}
- private AMSPacket handleADSWriteControlCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSWriteControlCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
- ADSState adsState = ADSState.of(commandBuffer);
+ AdsState adsState = AdsState.of(commandBuffer);
DeviceState deviceState = DeviceState.of(commandBuffer);
Length length = Length.of(commandBuffer);
if (length.getAsLong() > Integer.MAX_VALUE) {
@@ -231,16 +231,16 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amsPacket = ADSWriteControlRequest.of(amsHeader, adsState, deviceState, length, data);
+ amsPacket = AdsWriteControlRequest.of(amsHeader, adsState, deviceState, length, data);
} else {
Result result = Result.of(commandBuffer);
- amsPacket = ADSWriteControlResponse.of(amsHeader, result);
+ amsPacket = AdsWriteControlResponse.of(amsHeader, result);
}
return amsPacket;
}
- private AMSPacket handleADSAddDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSAddDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
IndexGroup indexGroup = IndexGroup.of(commandBuffer);
IndexOffset indexOffset = IndexOffset.of(commandBuffer);
@@ -248,30 +248,30 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
TransmissionMode transmissionMode = TransmissionMode.of(commandBuffer);
MaxDelay maxDelay = MaxDelay.of(commandBuffer);
CycleTime cycleTime = CycleTime.of(commandBuffer);
- commandBuffer.skipBytes(ADSAddDeviceNotificationRequest.Reserved.NUM_BYTES);
- amsPacket = ADSAddDeviceNotificationRequest.of(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
+ commandBuffer.skipBytes(AdsAddDeviceNotificationRequest.Reserved.NUM_BYTES);
+ amsPacket = AdsAddDeviceNotificationRequest.of(amsHeader, indexGroup, indexOffset, length, transmissionMode, maxDelay, cycleTime);
} else {
Result result = Result.of(commandBuffer);
NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
- amsPacket = ADSAddDeviceNotificationResponse.of(amsHeader, result, notificationHandle);
+ amsPacket = AdsAddDeviceNotificationResponse.of(amsHeader, result, notificationHandle);
}
return amsPacket;
}
- private AMSPacket handADSDeleteDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handADSDeleteDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
NotificationHandle notificationHandle = NotificationHandle.of(commandBuffer);
- amsPacket = ADSDeleteDeviceNotificationRequest.of(amsHeader, notificationHandle);
+ amsPacket = AdsDeleteDeviceNotificationRequest.of(amsHeader, notificationHandle);
} else {
Result result = Result.of(commandBuffer);
- amsPacket = ADSDeleteDeviceNotificationResponse.of(amsHeader, result);
+ amsPacket = AdsDeleteDeviceNotificationResponse.of(amsHeader, result);
}
return amsPacket;
}
- private AMSPacket handleADSDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSDeviceNotificationCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
Length length = Length.of(commandBuffer);
if (length.getAsLong() > Integer.MAX_VALUE) {
@@ -288,7 +288,7 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
adsStampHeaders.add(adsStampHeader);
}
adsDeviceNotificationBuffer.release();
- amsPacket = ADSDeviceNotificationRequest.of(amsHeader, length, stamps, adsStampHeaders);
+ amsPacket = AdsDeviceNotificationRequest.of(amsHeader, length, stamps, adsStampHeaders);
} else {
amsPacket = UnknownCommand.of(amsHeader, commandBuffer);
}
@@ -321,8 +321,8 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
return AdsNotificationSample.of(notificationHandle, sampleSize, data);
}
- private AMSPacket handleADSReadWriteCommand(State stateId, ByteBuf commandBuffer, AMSHeader amsHeader) {
- AMSPacket amsPacket;
+ private AmsPacket handleADSReadWriteCommand(State stateId, ByteBuf commandBuffer, AmsHeader amsHeader) {
+ AmsPacket amsPacket;
if (stateId.isRequest()) {
IndexGroup indexGroup = IndexGroup.of(commandBuffer);
IndexOffset indexOffset = IndexOffset.of(commandBuffer);
@@ -340,7 +340,7 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byte[] dataToRead = new byte[(int) readLength.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amsPacket = ADSReadWriteRequest.of(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
+ amsPacket = AdsReadWriteRequest.of(amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
} else {
Result result = Result.of(commandBuffer);
Length length = Length.of(commandBuffer);
@@ -350,12 +350,12 @@ public class ADS2TcpProtocol extends MessageToMessageCodec<ByteBuf, AMSPacket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amsPacket = ADSReadWriteResponse.of(amsHeader, result, length, data);
+ amsPacket = AdsReadWriteResponse.of(amsHeader, result, length, data);
}
return amsPacket;
}
- private AMSPacket handleUnknownCommand(ByteBuf commandBuffer, AMSHeader amsHeader) {
+ private AmsPacket handleUnknownCommand(ByteBuf commandBuffer, AmsHeader amsHeader) {
return UnknownCommand.of(amsHeader, commandBuffer);
}
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADSProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
similarity index 85%
rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADSProtocol.java
rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
index d6bf03f..d20b78a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADSProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
@@ -20,16 +20,16 @@ package org.apache.plc4x.java.ads.protocol;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
-import org.apache.plc4x.java.ads.api.commands.ADSReadRequest;
-import org.apache.plc4x.java.ads.api.commands.ADSReadResponse;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.ADSAddress;
+import org.apache.plc4x.java.ads.model.AdsAddress;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.messages.*;
@@ -55,20 +55,20 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder.decodeData;
import static org.apache.plc4x.java.ads.protocol.util.LittleEndianEncoder.encodeData;
-public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcRequestContainer<PlcRequest, PlcResponse>> {
+public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcRequestContainer<PlcRequest, PlcResponse>> {
- private static final Logger LOGGER = LoggerFactory.getLogger(Plc4X2ADSProtocol.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Plc4x2AdsProtocol.class);
private static final AtomicLong correlationBuilder = new AtomicLong(1);
private final ConcurrentMap<Long, PlcRequestContainer<PlcRequest, PlcResponse>> requests;
- private final AMSNetId targetAmsNetId;
- private final AMSPort targetAmsPort;
- private final AMSNetId sourceAmsNetId;
- private final AMSPort sourceAmsPort;
+ private final AmsNetId targetAmsNetId;
+ private final AmsPort targetAmsPort;
+ private final AmsNetId sourceAmsNetId;
+ private final AmsPort sourceAmsPort;
- public Plc4X2ADSProtocol(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort) {
+ public Plc4x2AdsProtocol(AmsNetId targetAmsNetId, AmsPort targetAmsPort, AmsNetId sourceAmsNetId, AmsPort sourceAmsPort) {
this.targetAmsNetId = targetAmsNetId;
this.targetAmsPort = targetAmsPort;
this.sourceAmsNetId = sourceAmsNetId;
@@ -94,17 +94,17 @@ public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcReque
}
WriteRequestItem<?> writeRequestItem = writeRequest.getRequestItems().get(0);
Address address = writeRequestItem.getAddress();
- if (!(address instanceof ADSAddress)) {
- throw new PlcProtocolException("Address not of type ADSAddress: " + address.getClass());
+ if (!(address instanceof AdsAddress)) {
+ throw new PlcProtocolException("Address not of type AdsAddress: " + address.getClass());
}
- ADSAddress adsAddress = (ADSAddress) address;
+ AdsAddress adsAddress = (AdsAddress) address;
Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
IndexGroup indexGroup = IndexGroup.of(adsAddress.getIndexGroup());
IndexOffset indexOffset = IndexOffset.of(adsAddress.getIndexOffset());
byte[] bytes = encodeData(writeRequestItem.getDatatype(), writeRequestItem.getValues().toArray());
Data data = Data.of(bytes);
- AMSPacket AMSPacket = ADSWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
- out.add(AMSPacket);
+ AmsPacket AmsPacket = AdsWriteRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, data);
+ out.add(AmsPacket);
requests.put(invokeId.getAsLong(), msg);
}
@@ -116,24 +116,24 @@ public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcReque
}
ReadRequestItem<?> readRequestItem = readRequest.getRequestItems().get(0);
Address address = readRequestItem.getAddress();
- if (!(address instanceof ADSAddress)) {
- throw new PlcProtocolException("Address not of type ADSAddress: " + address.getClass());
+ if (!(address instanceof AdsAddress)) {
+ throw new PlcProtocolException("Address not of type AdsAddress: " + address.getClass());
}
- ADSAddress adsAddress = (ADSAddress) address;
+ AdsAddress adsAddress = (AdsAddress) address;
Invoke invokeId = Invoke.of(correlationBuilder.incrementAndGet());
IndexGroup indexGroup = IndexGroup.of(adsAddress.getIndexGroup());
IndexOffset indexOffset = IndexOffset.of(adsAddress.getIndexOffset());
Length length = Length.of(readRequestItem.getSize());
- AMSPacket AMSPacket = ADSReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
- out.add(AMSPacket);
+ AmsPacket AmsPacket = AdsReadRequest.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup, indexOffset, length);
+ out.add(AmsPacket);
requests.put(invokeId.getAsLong(), msg);
}
@Override
- protected void decode(ChannelHandlerContext channelHandlerContext, AMSPacket AMSPacket, List<Object> out) throws Exception {
- PlcRequestContainer<PlcRequest, PlcResponse> plcRequestContainer = requests.remove(AMSPacket.getAmsHeader().getInvokeId().getAsLong());
+ protected void decode(ChannelHandlerContext channelHandlerContext, AmsPacket AmsPacket, List<Object> out) throws Exception {
+ PlcRequestContainer<PlcRequest, PlcResponse> plcRequestContainer = requests.remove(AmsPacket.getAmsHeader().getInvokeId().getAsLong());
if (plcRequestContainer == null) {
- LOGGER.info("Unmapped packet received {}", AMSPacket);
+ LOGGER.info("Unmapped packet received {}", AmsPacket);
return;
}
PlcRequest request = plcRequestContainer.getRequest();
@@ -141,16 +141,16 @@ public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcReque
// Handle the response to a read request.
if (request instanceof PlcReadRequest) {
- if (AMSPacket instanceof ADSReadResponse) {
- response = decodeReadResponse((ADSReadResponse) AMSPacket, plcRequestContainer);
+ if (AmsPacket instanceof AdsReadResponse) {
+ response = decodeReadResponse((AdsReadResponse) AmsPacket, plcRequestContainer);
} else {
- throw new PlcProtocolException("Wrong type correlated " + AMSPacket);
+ throw new PlcProtocolException("Wrong type correlated " + AmsPacket);
}
} else if (request instanceof PlcWriteRequest) {
- if (AMSPacket instanceof ADSWriteResponse) {
- response = decodeWriteResponse((ADSWriteResponse) AMSPacket, plcRequestContainer);
+ if (AmsPacket instanceof AdsWriteResponse) {
+ response = decodeWriteResponse((AdsWriteResponse) AmsPacket, plcRequestContainer);
} else {
- throw new PlcProtocolException("Wrong type correlated " + AMSPacket);
+ throw new PlcProtocolException("Wrong type correlated " + AmsPacket);
}
}
@@ -162,7 +162,7 @@ public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcReque
}
@SuppressWarnings("unchecked")
- private PlcResponse decodeWriteResponse(ADSWriteResponse responseMessage, PlcRequestContainer<PlcRequest, PlcResponse> requestContainer) {
+ private PlcResponse decodeWriteResponse(AdsWriteResponse responseMessage, PlcRequestContainer<PlcRequest, PlcResponse> requestContainer) {
PlcWriteRequest plcWriteRequest = (PlcWriteRequest) requestContainer.getRequest();
WriteRequestItem requestItem = plcWriteRequest.getRequestItems().get(0);
@@ -176,7 +176,7 @@ public class Plc4X2ADSProtocol extends MessageToMessageCodec<AMSPacket, PlcReque
}
@SuppressWarnings("unchecked")
- private PlcResponse decodeReadResponse(ADSReadResponse responseMessage, PlcRequestContainer<PlcRequest, PlcResponse> requestContainer) throws PlcProtocolException {
+ private PlcResponse decodeReadResponse(AdsReadResponse responseMessage, PlcRequestContainer<PlcRequest, PlcResponse> requestContainer) throws PlcProtocolException {
PlcReadRequest plcReadRequest = (PlcReadRequest) requestContainer.getRequest();
ReadRequestItem requestItem = plcReadRequest.getRequestItems().get(0);
diff --git a/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
index 0cdd1b3..1b92548 100644
--- a/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
+++ b/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.plc4x.java.ads.ADSPlcDriver
+org.apache.plc4x.java.ads.AdsPlcDriver
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSDumper.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
similarity index 89%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSDumper.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
index 485d0cb..9690d48 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSDumper.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsDumper.java
@@ -19,12 +19,12 @@
package org.apache.plc4x.java.ads;
import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.IndexGroup;
import org.apache.plc4x.java.ads.api.commands.types.IndexOffset;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.util.TcpHexDumper;
import org.pcap4j.core.PcapDumper;
@@ -42,9 +42,9 @@ import java.net.Socket;
import java.nio.file.Files;
import java.nio.file.Path;
-public class ADSDumper {
+public class AdsDumper {
- private static final Logger logger = LoggerFactory.getLogger(ADSDumper.class);
+ private static final Logger logger = LoggerFactory.getLogger(AdsDumper.class);
public static void main(String... args) throws Exception {
Path dumpFile = Files.createTempFile("pcapdump", ".pcap");
@@ -54,11 +54,11 @@ public class ADSDumper {
String randomString = RandomStringUtils.randomAscii(1024);
- ADSWriteRequest adsWriteRequest = ADSWriteRequest.of(
- AMSNetId.of("192.168.0.70.1.2"),
- AMSPort.of(12),
- AMSNetId.of("192.168.0.70.1.1"),
- AMSPort.of(14),
+ AdsWriteRequest adsWriteRequest = AdsWriteRequest.of(
+ AmsNetId.of("192.168.0.70.1.2"),
+ AmsPort.of(12),
+ AmsNetId.of("192.168.0.70.1.1"),
+ AmsPort.of(14),
Invoke.of(0),
IndexGroup.of(1),
IndexOffset.of(3),
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSPlcDriverTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
similarity index 93%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSPlcDriverTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
index 8d010f0..98965fe 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ADSPlcDriverTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/AdsPlcDriverTest.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.ads;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.ads.connection.ADSTcpPlcConnection;
+import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
import org.apache.plc4x.java.ads.util.TcpHexDumper;
import org.apache.plc4x.java.api.authentication.PlcUsernamePasswordAuthentication;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
@@ -32,14 +32,14 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-public class ADSPlcDriverTest {
+public class AdsPlcDriverTest {
@Rule
public TcpHexDumper tcpHexDumper = new TcpHexDumper(0, 2);
@Test
public void getConnection() throws Exception {
- ADSTcpPlcConnection adsConnection = (ADSTcpPlcConnection)
+ AdsTcpPlcConnection adsConnection = (AdsTcpPlcConnection)
new PlcDriverManager().getConnection("ads://localhost:" + tcpHexDumper.getPort() + "/0.0.0.0.0.0:13");
assertEquals(adsConnection.getTargetAmsNetId().toString(), "0.0.0.0.0.0");
assertEquals(adsConnection.getTargetAmsPort().toString(), "13");
@@ -74,7 +74,7 @@ public class ADSPlcDriverTest {
@Test
public void getProtocol() {
- ADSPlcDriver driver = new ADSPlcDriver();
+ AdsPlcDriver driver = new AdsPlcDriver();
assertThat(driver.getProtocolCode(), is("ads"));
assertThat(driver.getProtocolName(), is("Beckhoff Twincat ADS"));
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
index 5bec44c..d5c90e1 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java
@@ -47,26 +47,26 @@ public class CommandFactoryMethodTest {
@Parameterized.Parameters(name = "{index} {0}")
public static Collection<Object[]> data() {
return Stream.of(
- ADSAbstractRequest.class,
- ADSAbstractResponse.class,
- ADSAddDeviceNotificationRequest.class,
- ADSAddDeviceNotificationResponse.class,
- ADSDeleteDeviceNotificationRequest.class,
- ADSDeleteDeviceNotificationResponse.class,
- ADSDeviceNotificationRequest.class,
- ADSDeviceNotificationResponse.class,
- ADSReadDeviceInfoRequest.class,
- ADSReadDeviceInfoResponse.class,
- ADSReadRequest.class,
- ADSReadResponse.class,
- ADSReadStateRequest.class,
- ADSReadStateResponse.class,
- ADSReadWriteRequest.class,
- ADSReadWriteResponse.class,
- ADSWriteControlRequest.class,
- ADSWriteControlResponse.class,
- ADSWriteRequest.class,
- ADSWriteResponse.class,
+ AdsAbstractRequest.class,
+ AdsAbstractResponse.class,
+ AdsAddDeviceNotificationRequest.class,
+ AdsAddDeviceNotificationResponse.class,
+ AdsDeleteDeviceNotificationRequest.class,
+ AdsDeleteDeviceNotificationResponse.class,
+ AdsDeviceNotificationRequest.class,
+ AdsDeviceNotificationResponse.class,
+ AdsReadDeviceInfoRequest.class,
+ AdsReadDeviceInfoResponse.class,
+ AdsReadRequest.class,
+ AdsReadResponse.class,
+ AdsReadStateRequest.class,
+ AdsReadStateResponse.class,
+ AdsReadWriteRequest.class,
+ AdsReadWriteResponse.class,
+ AdsWriteControlRequest.class,
+ AdsWriteControlResponse.class,
+ AdsWriteRequest.class,
+ AdsWriteResponse.class,
UnknownCommand.class
).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
index 290cafb..2af1c52 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java
@@ -48,7 +48,7 @@ public class CommandTypesFactoryMethodTest {
public static Collection<Object[]> data() {
return Stream.of(
AdsReturnCode.class,
- ADSState.class,
+ AdsState.class,
CycleTime.class,
Data.class,
Device.class,
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
index e653f2b..9c554ee 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.plc4x.java.ads.api.generic;
import org.apache.plc4x.java.ads.api.generic.types.Command;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPHeader;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.AmsTcpHeader;
import org.apache.plc4x.java.ads.api.util.LengthSupplier;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,10 +48,10 @@ public class GenericFactoryMethodTest {
@Parameterized.Parameters(name = "{index} {0}")
public static Collection<Object[]> data() {
return Stream.of(
- ADSData.class,
- AMSHeader.class,
- AMSTCPHeader.class,
- AMSTCPPacket.class
+ AdsData.class,
+ AmsHeader.class,
+ AmsTcpHeader.class,
+ AmsTCPPacket.class
).map(clazz -> new Object[]{clazz}).collect(Collectors.toList());
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSErrorTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
similarity index 79%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSErrorTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
index 10925ee..b8bc3d2 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSErrorTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsErrorTest.java
@@ -23,32 +23,32 @@ import io.netty.buffer.Unpooled;
import org.junit.Test;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
-public class AMSErrorTest {
+public class AmsErrorTest {
@Test
public void errorBytes() {
// note bytes in reverse order
- AMSError error = AMSError.of((byte)0x01, (byte)0x20, (byte)0x00, (byte)0x00);
+ AmsError error = AmsError.of((byte)0x01, (byte)0x20, (byte)0x00, (byte)0x00);
assertThat(error.getAsLong(), is(0x2001L));
}
@Test
public void errorLong() {
- AMSError error = AMSError.of(0xFF02L);
+ AmsError error = AmsError.of(0xFF02L);
assertThat(error.getAsLong(), is(0xFF02L));
}
@Test
public void errorLongBig() {
- AMSError error = AMSError.of(0xFFFFFFFFL);
+ AmsError error = AmsError.of(0xFFFFFFFFL);
assertThat(error.getAsLong(), is(0xFFFFFFFFL));
}
@Test
public void errorString() {
- AMSError error = AMSError.of("255");
+ AmsError error = AmsError.of("255");
assertThat(error.getAsLong(), is(0xFFL));
}
@@ -62,30 +62,30 @@ public class AMSErrorTest {
buffer.writeByte((byte)0x00);
buffer.writeByte((byte)0x00);
- AMSError error = AMSError.of(buffer);
+ AmsError error = AmsError.of(buffer);
assertThat(error.getAsLong(), is(260L));
}
@Test(expected = NumberFormatException.class)
public void noHex() {
- AMSError error = AMSError.of("0xFF000000");
+ AmsError error = AmsError.of("0xFF000000");
}
@Test(expected = IllegalArgumentException.class)
public void errorLongTooBig() {
- AMSError error = AMSError.of(0x100000000L);
+ AmsError error = AmsError.of(0x100000000L);
}
@Test(expected = IllegalArgumentException.class)
public void errorNegative() {
- AMSError error = AMSError.of(-1);
+ AmsError error = AmsError.of(-1);
}
@Test
public void equals() {
- AMSError a = AMSError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
- AMSError b = AMSError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
- AMSError c = AMSError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0xFF);
+ AmsError a = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
+ AmsError b = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4);
+ AmsError c = AmsError.of((byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0xFF);
byte array[] = {(byte) 0x1, (byte) 0x2, (byte) 0x3, (byte) 0x4};
assertThat(a.equals(a), is(true));
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetIdTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
similarity index 82%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetIdTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
index 2fae32f..bdc95b1 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSNetIdTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsNetIdTest.java
@@ -21,40 +21,40 @@ package org.apache.plc4x.java.ads.api.generic.types;
import org.junit.Test;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
-public class AMSNetIdTest {
+public class AmsNetIdTest {
@Test
public void netIdBytes() {
// note bytes in reverse order
- AMSNetId netid = AMSNetId.of((byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06);
+ AmsNetId netid = AmsNetId.of((byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06);
assertThat(netid.toString(), is("1.2.3.4.5.6"));
}
@Test
public void netIdString() {
// note bytes in reverse order
- AMSNetId netid = AMSNetId.of("1.2.3.4.5.6");
+ AmsNetId netid = AmsNetId.of("1.2.3.4.5.6");
assertThat(netid.toString(), is("1.2.3.4.5.6"));
}
@Test(expected = IllegalArgumentException.class)
public void netIdTooShort() {
// note bytes in reverse order
- AMSNetId netid = AMSNetId.of("1.2.3.4");
+ AmsNetId netid = AmsNetId.of("1.2.3.4");
}
@Test(expected = IllegalArgumentException.class)
public void netIdStringTooLong() {
// note bytes in reverse order
- AMSNetId netid = AMSNetId.of("1.2.3.4.5.6.7.8");
+ AmsNetId netid = AmsNetId.of("1.2.3.4.5.6.7.8");
}
@Test(expected = IllegalArgumentException.class)
public void netIdStringWrongSeperator() {
// note bytes in reverse order
- AMSNetId netid = AMSNetId.of("1:2:3:4:5:6");
+ AmsNetId netid = AmsNetId.of("1:2:3:4:5:6");
}
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSPortTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
similarity index 72%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSPortTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
index 5982419..43164b8 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AMSPortTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/AmsPortTest.java
@@ -25,45 +25,45 @@ import static org.apache.plc4x.java.ads.util.Junit5Backport.assertThrows;
import static org.junit.Assert.assertEquals;
-public class AMSPortTest {
+public class AmsPortTest {
private final byte NULL_BYTE = 0x0;
@Test
public void ofBytes() {
- assertEquals("0", AMSPort.of(NULL_BYTE, NULL_BYTE).toString());
- assertThrows(IllegalArgumentException.class, () -> AMSPort.of(NULL_BYTE, NULL_BYTE, NULL_BYTE));
+ assertEquals("0", AmsPort.of(NULL_BYTE, NULL_BYTE).toString());
+ assertThrows(IllegalArgumentException.class, () -> AmsPort.of(NULL_BYTE, NULL_BYTE, NULL_BYTE));
}
@Test
public void ofInt() {
- assertByte(AMSPort.of(1), "0x0100");
- assertByte(AMSPort.of(65535), "0xffff");
- assertThrows(IllegalArgumentException.class, () -> AMSPort.of(-1));
- assertThrows(IllegalArgumentException.class, () -> AMSPort.of(65536));
+ assertByte(AmsPort.of(1), "0x0100");
+ assertByte(AmsPort.of(65535), "0xffff");
+ assertThrows(IllegalArgumentException.class, () -> AmsPort.of(-1));
+ assertThrows(IllegalArgumentException.class, () -> AmsPort.of(65536));
}
@Test(expected = IllegalArgumentException.class)
public void noStrings() {
- AMSPort.of("port20");
+ AmsPort.of("port20");
}
@Test(expected = IllegalArgumentException.class)
public void noHex() {
- AMSPort.of("0x0100");
+ AmsPort.of("0x0100");
}
@Test
public void ofString() {
- assertByte(AMSPort.of("1"), "0x0100");
+ assertByte(AmsPort.of("1"), "0x0100");
}
@Test
public void testToString() {
- assertEquals(AMSPort.of("1").toString(), "1");
+ assertEquals(AmsPort.of("1").toString(), "1");
}
- private void assertByte(AMSPort actual, String expected) {
+ private void assertByte(AmsPort actual, String expected) {
assertEquals(expected, "0x" + Hex.encodeHexString(actual.getBytes()));
}
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
index d112d96..4cf323e 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/types/GenericTypesFactoryMethodTest.java
@@ -43,9 +43,9 @@ public class GenericTypesFactoryMethodTest {
@Parameterized.Parameters(name = "{index} {0}")
public static Collection<Object[]> data() {
return Stream.of(
- AMSError.class,
- AMSNetId.class,
- AMSPort.class,
+ AmsError.class,
+ AmsNetId.class,
+ AmsPort.class,
Command.class,
DataLength.class,
Invoke.class,
@@ -72,7 +72,7 @@ public class GenericTypesFactoryMethodTest {
public void testOfString() throws Exception {
Method ofMethod = clazz.getDeclaredMethod("of", String.class);
String testString = "1";
- if (clazz == AMSNetId.class) {
+ if (clazz == AmsNetId.class) {
testString = "1.1.1.1.1.1";
} else if (clazz == Command.class) {
testString = Command.ADS_ADD_DEVICE_NOTIFICATION.name();
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnectionTests.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
similarity index 81%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnectionTests.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
index 6833921..1ebb6d8 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/ADSTcpPlcConnectionTests.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java
@@ -19,9 +19,9 @@ under the License.
package org.apache.plc4x.java.ads.connection;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
-import org.apache.plc4x.java.ads.model.ADSAddress;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
+import org.apache.plc4x.java.ads.model.AdsAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -30,13 +30,13 @@ import java.net.InetAddress;
import static org.junit.Assert.*;
-public class ADSTcpPlcConnectionTests {
+public class AdsTcpPlcConnectionTests {
- private ADSTcpPlcConnection adsTcpPlcConnection;
+ private AdsTcpPlcConnection adsTcpPlcConnection;
@Before
public void setUp() throws Exception {
- adsTcpPlcConnection = new ADSTcpPlcConnection(InetAddress.getByName("localhost"), AMSNetId.of("0.0.0.0.0.0"), AMSPort.of(13));
+ adsTcpPlcConnection = new AdsTcpPlcConnection(InetAddress.getByName("localhost"), AmsNetId.of("0.0.0.0.0.0"), AmsPort.of(13));
}
@After
@@ -62,7 +62,7 @@ public class ADSTcpPlcConnectionTests {
@Test
public void parseAddress() throws Exception {
try {
- ADSAddress address = (ADSAddress) adsTcpPlcConnection.parseAddress("1/1");
+ AdsAddress address = (AdsAddress) adsTcpPlcConnection.parseAddress("1/1");
assertEquals(address.getIndexGroup(), 1);
assertEquals(address.getIndexOffset(), 1);
} catch (IllegalArgumentException exception) {
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/ADSAddressTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsAddressTest.java
similarity index 79%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/ADSAddressTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsAddressTest.java
index a389f21..f577a47 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/ADSAddressTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/model/AdsAddressTest.java
@@ -18,40 +18,38 @@
*/
package org.apache.plc4x.java.ads.model;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
-public class ADSAddressTest {
+public class AdsAddressTest {
@Test
public void of() {
- ADSAddress address = ADSAddress.of("1/10");
+ AdsAddress address = AdsAddress.of("1/10");
assertThat(address.getIndexGroup(), is(1L));
assertThat(address.getIndexOffset(), is(10L));
}
@Test(expected = IllegalArgumentException.class)
public void stringInAddress() {
- ADSAddress address = ADSAddress.of("group/offset");
+ AdsAddress address = AdsAddress.of("group/offset");
}
@Test(expected = IllegalArgumentException.class)
public void singleNumberAddress() {
- ADSAddress address = ADSAddress.of("10");
+ AdsAddress address = AdsAddress.of("10");
}
@Test(expected = IllegalArgumentException.class)
public void wrongSeperator() {
- ADSAddress address = ADSAddress.of("1:10");
+ AdsAddress address = AdsAddress.of("1:10");
}
@Test
public void getGroupAndOffset() {
- ADSAddress address = ADSAddress.of(2L, 20L);
+ AdsAddress address = AdsAddress.of(2L, 20L);
assertThat(address.getIndexGroup(), is(2L));
assertThat(address.getIndexOffset(), is(20L));
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocolTest.java
similarity index 83%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocolTest.java
index 6364a7e..7949880 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocolTest.java
@@ -21,11 +21,11 @@ package org.apache.plc4x.java.ads.protocol;
import io.netty.buffer.ByteBuf;
import org.apache.plc4x.java.ads.api.commands.*;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.serial.AMSSerialFrame;
+import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,44 +45,44 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@RunWith(Parameterized.class)
-public class ADS2SerialProtocolTest {
+public class Ads2SerialProtocolTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ADS2SerialProtocolTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Ads2SerialProtocolTest.class);
- private ADS2SerialProtocol SUT;
+ private Ads2SerialProtocol SUT;
@Parameterized.Parameter
- public AMSSerialFrame amsSerialFrame;
+ public AmsSerialFrame amsSerialFrame;
@Parameterized.Parameter(1)
public String clazzName;
@Parameterized.Parameters(name = "{index} {1}")
public static Collection<Object[]> data() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
Data data = Data.of("Hello World!".getBytes());
return Stream.of(
- ADSAddDeviceNotificationRequest.of(
+ AdsAddDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(1), IndexOffset.of(1), Length.of(1), TransmissionMode.of(1), MaxDelay.of(1), CycleTime.of(1)).toAmsSerialFrame((byte) 0),
- ADSAddDeviceNotificationResponse.of(
+ AdsAddDeviceNotificationResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
NotificationHandle.of(0)
).toAmsSerialFrame((byte) 0),
- ADSDeleteDeviceNotificationRequest.of(
+ AdsDeleteDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
NotificationHandle.of(0)
).toAmsSerialFrame((byte) 0),
- ADSDeleteDeviceNotificationResponse.of(
+ AdsDeleteDeviceNotificationResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmsSerialFrame((byte) 0),
- ADSDeviceNotificationRequest.of(
+ AdsDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Stamps.of(1),
Collections.singletonList(
@@ -93,10 +93,10 @@ public class ADS2SerialProtocolTest {
)
)
).toAmsSerialFrame((byte) 0),
- ADSReadDeviceInfoRequest.of(
+ AdsReadDeviceInfoRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
).toAmsSerialFrame((byte) 0),
- ADSReadDeviceInfoResponse.of(
+ AdsReadDeviceInfoResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
MajorVersion.of((byte) 1),
@@ -104,53 +104,53 @@ public class ADS2SerialProtocolTest {
Version.of(3),
Device.of("Random DeviceId")
).toAmsSerialFrame((byte) 0),
- ADSReadRequest.of(
+ AdsReadRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
Length.of(1)
).toAmsSerialFrame((byte) 0),
- ADSReadResponse.of(
+ AdsReadResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
data
).toAmsSerialFrame((byte) 0),
- ADSReadStateRequest.of(
+ AdsReadStateRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
).toAmsSerialFrame((byte) 0),
- ADSReadStateResponse.of(
+ AdsReadStateResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmsSerialFrame((byte) 0),
- ADSReadWriteRequest.of(
+ AdsReadWriteRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
ReadLength.of(data.getCalculatedLength()),
data
).toAmsSerialFrame((byte) 0),
- ADSReadWriteResponse.of(
+ AdsReadWriteResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
data
).toAmsSerialFrame((byte) 0),
- ADSWriteControlRequest.of(
+ AdsWriteControlRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
- ADSState.of(0xaffe),
+ AdsState.of(0xaffe),
DeviceState.of(0xaffe),
data
).toAmsSerialFrame((byte) 0),
- ADSWriteControlResponse.of(
+ AdsWriteControlResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmsSerialFrame((byte) 0),
- ADSWriteRequest.of(
+ AdsWriteRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
data
).toAmsSerialFrame((byte) 0),
- ADSWriteResponse.of(
+ AdsWriteResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmsSerialFrame((byte) 0)
@@ -164,7 +164,7 @@ public class ADS2SerialProtocolTest {
@Before
public void setUp() throws Exception {
- SUT = new ADS2SerialProtocol();
+ SUT = new Ads2SerialProtocol();
byte[] bytes = amsSerialFrame.getBytes();
LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsSerialFrame, bytes.length, amsSerialFrame.dump());
}
@@ -196,8 +196,8 @@ public class ADS2SerialProtocolTest {
SUT.decode(null, byteBuf, inbound);
assertEquals(1, inbound.size());
assertThat(inbound, hasSize(1));
- assertThat(inbound.get(0), instanceOf(AMSPacket.class));
- AMSPacket inboundAmsPacket = (AMSPacket) inbound.get(0);
+ assertThat(inbound.get(0), instanceOf(AmsPacket.class));
+ AmsPacket inboundAmsPacket = (AmsPacket) inbound.get(0);
assertThat("inbound divers from outbound", this.amsSerialFrame, equalTo(inboundAmsPacket.toAmsSerialFrame((byte) 0)));
}
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocolTest.java
similarity index 78%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocolTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocolTest.java
index c35ad9c..7a23aa4 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2TcpProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocolTest.java
@@ -21,11 +21,11 @@ package org.apache.plc4x.java.ads.protocol;
import io.netty.buffer.ByteBuf;
import org.apache.plc4x.java.ads.api.commands.*;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.api.tcp.AMSTCPPacket;
+import org.apache.plc4x.java.ads.api.tcp.AmsTCPPacket;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,44 +45,44 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@RunWith(Parameterized.class)
-public class ADS2TcpProtocolTest {
+public class Ads2TcpProtocolTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ADS2TcpProtocolTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Ads2TcpProtocolTest.class);
- private ADS2TcpProtocol SUT;
+ private Ads2TcpProtocol SUT;
@Parameterized.Parameter
- public AMSTCPPacket amstcpPacket;
+ public AmsTCPPacket amsTCPPacket;
@Parameterized.Parameter(1)
public String clazzName;
@Parameterized.Parameters(name = "{index} {1}")
public static Collection<Object[]> data() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
Data data = Data.of("Hello World!".getBytes());
return Stream.of(
- ADSAddDeviceNotificationRequest.of(
+ AdsAddDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(1), IndexOffset.of(1), Length.of(1), TransmissionMode.of(1), MaxDelay.of(1), CycleTime.of(1)).toAmstcpPacket(),
- ADSAddDeviceNotificationResponse.of(
+ AdsAddDeviceNotificationResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
NotificationHandle.of(0)
).toAmstcpPacket(),
- ADSDeleteDeviceNotificationRequest.of(
+ AdsDeleteDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
NotificationHandle.of(0)
).toAmstcpPacket(),
- ADSDeleteDeviceNotificationResponse.of(
+ AdsDeleteDeviceNotificationResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmstcpPacket(),
- ADSDeviceNotificationRequest.of(
+ AdsDeviceNotificationRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Stamps.of(1),
Collections.singletonList(
@@ -93,10 +93,10 @@ public class ADS2TcpProtocolTest {
)
)
).toAmstcpPacket(),
- ADSReadDeviceInfoRequest.of(
+ AdsReadDeviceInfoRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
).toAmstcpPacket(),
- ADSReadDeviceInfoResponse.of(
+ AdsReadDeviceInfoResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
MajorVersion.of((byte) 1),
@@ -104,53 +104,53 @@ public class ADS2TcpProtocolTest {
Version.of(3),
Device.of("Random DeviceId")
).toAmstcpPacket(),
- ADSReadRequest.of(
+ AdsReadRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
Length.of(1)
).toAmstcpPacket(),
- ADSReadResponse.of(
+ AdsReadResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
data
).toAmstcpPacket(),
- ADSReadStateRequest.of(
+ AdsReadStateRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId
).toAmstcpPacket(),
- ADSReadStateResponse.of(
+ AdsReadStateResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmstcpPacket(),
- ADSReadWriteRequest.of(
+ AdsReadWriteRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
ReadLength.of(data.getCalculatedLength()),
data
).toAmstcpPacket(),
- ADSReadWriteResponse.of(
+ AdsReadWriteResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0),
data
).toAmstcpPacket(),
- ADSWriteControlRequest.of(
+ AdsWriteControlRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
- ADSState.of(0xaffe),
+ AdsState.of(0xaffe),
DeviceState.of(0xaffe),
data
).toAmstcpPacket(),
- ADSWriteControlResponse.of(
+ AdsWriteControlResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmstcpPacket(),
- ADSWriteRequest.of(
+ AdsWriteRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(0),
IndexOffset.of(0),
data
).toAmstcpPacket(),
- ADSWriteResponse.of(
+ AdsWriteResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
Result.of(0)
).toAmstcpPacket()
@@ -159,20 +159,20 @@ public class ADS2TcpProtocolTest {
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId,
Unpooled.wrappedBuffer(new byte[]{42})
)*/
- ).map(amstcpPacket -> new Object[]{amstcpPacket, amstcpPacket.getClass().getSimpleName()}).collect(Collectors.toList());
+ ).map(amsTCPPacket -> new Object[]{amsTCPPacket, amsTCPPacket.getClass().getSimpleName()}).collect(Collectors.toList());
}
@Before
public void setUp() throws Exception {
- SUT = new ADS2TcpProtocol();
- byte[] bytes = amstcpPacket.getBytes();
- LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amstcpPacket, bytes.length, amstcpPacket.dump());
+ SUT = new Ads2TcpProtocol();
+ byte[] bytes = amsTCPPacket.getBytes();
+ LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}", amsTCPPacket, bytes.length, amsTCPPacket.dump());
}
@Test
public void encode() throws Exception {
ArrayList<Object> out = new ArrayList<>();
- SUT.encode(null, amstcpPacket.getAmsPacket(), out);
+ SUT.encode(null, amsTCPPacket.getAmsPacket(), out);
assertEquals(1, out.size());
assertThat(out, hasSize(1));
}
@@ -180,14 +180,14 @@ public class ADS2TcpProtocolTest {
@Test
public void decode() throws Exception {
ArrayList<Object> out = new ArrayList<>();
- SUT.decode(null, amstcpPacket.getByteBuf(), out);
+ SUT.decode(null, amsTCPPacket.getByteBuf(), out);
assertThat(out, hasSize(1));
}
@Test
public void roundTrip() throws Exception {
ArrayList<Object> outbound = new ArrayList<>();
- SUT.encode(null, amstcpPacket.getAmsPacket(), outbound);
+ SUT.encode(null, amsTCPPacket.getAmsPacket(), outbound);
assertEquals(1, outbound.size());
assertThat(outbound, hasSize(1));
assertThat(outbound.get(0), instanceOf(ByteBuf.class));
@@ -196,8 +196,8 @@ public class ADS2TcpProtocolTest {
SUT.decode(null, byteBuf, inbound);
assertEquals(1, inbound.size());
assertThat(inbound, hasSize(1));
- assertThat(inbound.get(0), instanceOf(AMSPacket.class));
- AMSPacket inboundAmsPacket = (AMSPacket) inbound.get(0);
- assertThat("inbound divers from outbound", this.amstcpPacket, equalTo(inboundAmsPacket.toAmstcpPacket()));
+ assertThat(inbound.get(0), instanceOf(AmsPacket.class));
+ AmsPacket inboundAmsPacket = (AmsPacket) inbound.get(0);
+ assertThat("inbound divers from outbound", this.amsTCPPacket, equalTo(inboundAmsPacket.toAmstcpPacket()));
}
}
\ No newline at end of file
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADS2TcpProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2Ads2TcpProtocolTest.java
similarity index 84%
rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADS2TcpProtocolTest.java
rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2Ads2TcpProtocolTest.java
index 5778b47..0de9738 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2ADS2TcpProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4X2Ads2TcpProtocolTest.java
@@ -19,17 +19,17 @@
package org.apache.plc4x.java.ads.protocol;
import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.plc4x.java.ads.api.commands.ADSReadResponse;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
import org.apache.plc4x.java.ads.api.commands.types.Data;
import org.apache.plc4x.java.ads.api.commands.types.Result;
-import org.apache.plc4x.java.ads.api.generic.AMSHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSPacket;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.AmsHeader;
+import org.apache.plc4x.java.ads.api.generic.AmsPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
-import org.apache.plc4x.java.ads.model.ADSAddress;
+import org.apache.plc4x.java.ads.model.AdsAddress;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import org.apache.plc4x.java.api.messages.items.ResponseItem;
@@ -54,12 +54,12 @@ import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
@RunWith(Parameterized.class)
-public class Plc4X2ADS2TcpProtocolTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ADS2TcpProtocolTest.class);
+public class Plc4X2Ads2TcpProtocolTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Ads2TcpProtocolTest.class);
public static final Calendar calenderInstance = Calendar.getInstance();
- private Plc4X2ADSProtocol SUT;
+ private Plc4x2AdsProtocol SUT;
@Parameterized.Parameter
public String payloadClazzName;
@@ -74,17 +74,17 @@ public class Plc4X2ADS2TcpProtocolTest {
public String plcRequestContainerClassName;
@Parameterized.Parameter(4)
- public AMSPacket amsPacket;
+ public AmsPacket amsPacket;
@Parameterized.Parameter(5)
public String amsPacketClassName;
@Parameterized.Parameters(name = "{index} Type:{0} {3} {5}")
public static Collection<Object[]> data() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(2);
return Stream.of(Boolean.class,
Byte.class,
@@ -117,17 +117,17 @@ public class Plc4X2ADS2TcpProtocolTest {
new PlcRequestContainer<>(
PlcWriteRequest
.builder()
- .addItem(ADSAddress.of(1, 2), pair.left)
+ .addItem(AdsAddress.of(1, 2), pair.left)
.build(), new CompletableFuture<>()),
- ADSWriteResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0))
+ AdsWriteResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0))
),
ImmutablePair.of(
new PlcRequestContainer<>(
PlcReadRequest
.builder()
- .addItem(pair.left.getClass(), ADSAddress.of(1, 2))
+ .addItem(pair.left.getClass(), AdsAddress.of(1, 2))
.build(), new CompletableFuture<>()),
- ADSReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), Data.of(pair.right))
+ AdsReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), Data.of(pair.right))
)
))
.flatMap(stream -> stream)
@@ -136,11 +136,11 @@ public class Plc4X2ADS2TcpProtocolTest {
@Before
public void setUp() throws Exception {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
- SUT = new Plc4X2ADSProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
+ SUT = new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort);
}
@Test
@@ -148,11 +148,11 @@ public class Plc4X2ADS2TcpProtocolTest {
ArrayList<Object> out = new ArrayList<>();
SUT.encode(null, plcRequestContainer, out);
assertThat(out, hasSize(1));
- assertThat(out.get(0), instanceOf(AMSPacket.class));
- AMSPacket amsPacket = (AMSPacket) out.get(0);
+ assertThat(out.get(0), instanceOf(AmsPacket.class));
+ AmsPacket amsPacket = (AmsPacket) out.get(0);
LOGGER.info("{}\nHexDump:\n{}", amsPacket, amsPacket.dump());
- if (amsPacket instanceof ADSWriteRequest) {
- ADSWriteRequest adsWriteRequest = (ADSWriteRequest) amsPacket;
+ if (amsPacket instanceof AdsWriteRequest) {
+ AdsWriteRequest adsWriteRequest = (AdsWriteRequest) amsPacket;
byte[] value = adsWriteRequest.getData().getBytes();
if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
assertThat(value, equalTo(new byte[]{0x1}));
@@ -188,7 +188,7 @@ public class Plc4X2ADS2TcpProtocolTest {
PlcResponse plcResponse = plcRequestContainer.getResponseFuture().get();
ResponseItem responseItem = (ResponseItem) plcResponse.getResponseItem().get();
LOGGER.info("ResponseItem {}", responseItem);
- if (amsPacket instanceof ADSReadResponse) {
+ if (amsPacket instanceof AdsReadResponse) {
ReadResponseItem readResponseItem = (ReadResponseItem) responseItem;
Object value = readResponseItem.getValues().get(0);
if (payloadClazzName.equals(Boolean.class.getSimpleName())) {
@@ -214,7 +214,7 @@ public class Plc4X2ADS2TcpProtocolTest {
correlationBuilderField.setAccessible(true);
AtomicLong correlationBuilder = (AtomicLong) correlationBuilderField.get(SUT);
- AMSHeader amsHeader = amsPacket.getAmsHeader();
+ AmsHeader amsHeader = amsPacket.getAmsHeader();
Field invokeIdField = amsHeader.getClass().getDeclaredField("invokeId");
Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
diff --git a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
index 2e74fc7..90fa96b 100644
--- a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
+++ b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocolBenchmark.java
@@ -20,13 +20,13 @@
package org.apache.plc4x.java.ads.protocol;
import io.netty.buffer.Unpooled;
-import org.apache.plc4x.java.ads.api.commands.ADSReadRequest;
-import org.apache.plc4x.java.ads.api.commands.ADSReadResponse;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteRequest;
-import org.apache.plc4x.java.ads.api.commands.ADSWriteResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsReadRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsReadResponse;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteRequest;
+import org.apache.plc4x.java.ads.api.commands.AdsWriteResponse;
import org.apache.plc4x.java.ads.api.commands.types.*;
-import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
-import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
@@ -38,10 +38,10 @@ public class ADSProtocolBenchmark {
@State(Scope.Benchmark)
public static class MyState {
- ADS2TcpProtocol SUT = new ADS2TcpProtocol();
- ADSWriteRequest adsWriteRequest = buildAdsWriteRequest();
+ Ads2TcpProtocol SUT = new Ads2TcpProtocol();
+ AdsWriteRequest adsWriteRequest = buildAdsWriteRequest();
byte[] adsWriteResponse = buildADSWriteResponse();
- ADSReadRequest adsReadRequest = buildAdsReadRequest();
+ AdsReadRequest adsReadRequest = buildAdsReadRequest();
byte[] adsReadResponse = buildADSReadResponse();
@Setup(Level.Trial)
@@ -105,14 +105,14 @@ public class ADSProtocolBenchmark {
blackhole.consume(out.remove());
}
- private static ADSWriteRequest buildAdsWriteRequest() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ private static AdsWriteRequest buildAdsWriteRequest() {
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
Data data = Data.of("Hello World!".getBytes());
- return ADSWriteRequest.of(
+ return AdsWriteRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(1),
IndexOffset.of(1),
@@ -121,25 +121,25 @@ public class ADSProtocolBenchmark {
}
private static byte[] buildADSWriteResponse() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
Result result = Result.of(AdsReturnCode.ADS_CODE_0);
- return ADSWriteResponse.of(
+ return AdsWriteResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
result
).getBytes();
}
- private static ADSReadRequest buildAdsReadRequest() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ private static AdsReadRequest buildAdsReadRequest() {
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
- return ADSReadRequest.of(
+ return AdsReadRequest.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
IndexGroup.of(1),
IndexOffset.of(1),
@@ -148,14 +148,14 @@ public class ADSProtocolBenchmark {
}
private static byte[] buildADSReadResponse() {
- AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
- AMSPort targetAmsPort = AMSPort.of(7);
- AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
- AMSPort sourceAmsPort = AMSPort.of(14);
+ AmsNetId targetAmsNetId = AmsNetId.of("1.2.3.4.5.6");
+ AmsPort targetAmsPort = AmsPort.of(7);
+ AmsNetId sourceAmsNetId = AmsNetId.of("8.9.10.11.12.13");
+ AmsPort sourceAmsPort = AmsPort.of(14);
Invoke invokeId = Invoke.of(15);
Result result = Result.of(AdsReturnCode.ADS_CODE_0);
Data data = Data.of("Hello World!".getBytes());
- return ADSReadResponse.of(
+ return AdsReadResponse.of(
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId,
result,
data
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.