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
The following commit(s) were added to refs/heads/master by this push:
new 4e904ba fixed typo paket -> packet
4e904ba is described below
commit 4e904bab0d7d134b852228dd705c9946dc545419
Author: Sebastian Rühl <sru...@apache.org>
AuthorDate: Fri Feb 16 21:12:40 2018 +0100
fixed typo paket -> packet
---
.../java/ads/api/commands/ADSAbstractRequest.java | 4 +-
.../java/ads/api/commands/ADSAbstractResponse.java | 4 +-
.../java/ads/api/commands/UnknownCommand.java | 6 +--
.../{AMSTCPPaket.java => AMSTCPPacket.java} | 8 +--
.../apache/plc4x/java/ads/netty/ADSProtocol.java | 62 +++++++++++-----------
.../plc4x/java/ads/netty/Plc4XADSProtocol.java | 30 +++++------
.../plc4x/java/ads/netty/ADSProtocolTest.java | 14 ++---
.../plc4x/java/ads/netty/Plc4XADSProtocolTest.java | 4 +-
8 files changed, 66 insertions(+), 66 deletions(-)
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
index 5149f94..a9572c4 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
@@ -20,13 +20,13 @@ 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.AMSTCPHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
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 AMSTCPPaket {
+public abstract class ADSAbstractRequest extends AMSTCPPacket {
protected ADSAbstractRequest(AMSTCPHeader amstcpHeader, AMSHeader
amsHeader) {
super(amstcpHeader, amsHeader);
}
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
index 8c9acc4..8bd00d3 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
@@ -20,13 +20,13 @@ 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.AMSTCPHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
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 AMSTCPPaket {
+public abstract class ADSAbstractResponse extends AMSTCPPacket {
protected ADSAbstractResponse(AMSTCPHeader amstcpHeader, AMSHeader
amsHeader) {
super(amstcpHeader, amsHeader);
}
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 0e983d7..3e2c6ee 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
@@ -22,7 +22,7 @@ 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.AMSTCPHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
import org.apache.plc4x.java.ads.api.generic.types.Command;
import java.util.Objects;
@@ -31,7 +31,7 @@ import java.util.Objects;
* Unknown ADS Package
*/
@ADSCommandType(Command.UNKNOWN)
-public class UnknownCommand extends AMSTCPPaket {
+public class UnknownCommand extends AMSTCPPacket {
final ByteBuf remainingBytes;
@@ -45,7 +45,7 @@ public class UnknownCommand extends AMSTCPPaket {
return () -> remainingBytes;
}
- public static AMSTCPPaket of(AMSTCPHeader amstcpHeader, AMSHeader
amsHeader, ByteBuf remainingBytes) {
+ public static AMSTCPPacket of(AMSTCPHeader amstcpHeader, AMSHeader
amsHeader, ByteBuf remainingBytes) {
return new UnknownCommand(amstcpHeader, amsHeader, remainingBytes);
}
}
diff --git
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPaket.java
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPacket.java
similarity index 90%
rename from
plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPaket.java
rename to
plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPacket.java
index b3acc37..2dd7d09 100644
---
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPaket.java
+++
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/AMSTCPPacket.java
@@ -26,24 +26,24 @@ import org.apache.plc4x.java.ads.api.util.ByteReadable;
import static java.util.Objects.requireNonNull;
import static
org.apache.plc4x.java.ads.api.util.ByteReadableUtils.buildByteBuff;
-public abstract class AMSTCPPaket implements ByteReadable {
+public abstract class AMSTCPPacket implements ByteReadable {
private final AMSTCPHeader amstcpHeader;
private final AMSHeader amsHeader;
- public AMSTCPPaket(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
+ public AMSTCPPacket(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
this.amstcpHeader = requireNonNull(amstcpHeader);
this.amsHeader = requireNonNull(amsHeader);
}
- public AMSTCPPaket(AMSHeader amsHeader) {
+ public AMSTCPPacket(AMSHeader amsHeader) {
// 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(amsHeader), () ->
getAdsData().getCalculatedLength());
this.amsHeader = requireNonNull(amsHeader);
}
- public AMSTCPPaket(AMSNetId targetAmsNetId, AMSPort targetAmsPort,
AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId)
{
+ public AMSTCPPacket(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.");
}
diff --git
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java
index fc97723..a1a959c 100644
---
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java
+++
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java
@@ -26,7 +26,7 @@ import org.apache.plc4x.java.ads.api.commands.types.*;
import org.apache.plc4x.java.ads.api.commands.types.Length;
import org.apache.plc4x.java.ads.api.generic.AMSHeader;
import org.apache.plc4x.java.ads.api.generic.AMSTCPHeader;
-import org.apache.plc4x.java.ads.api.generic.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
import org.apache.plc4x.java.ads.api.generic.types.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,23 +37,23 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class ADSProtocol extends MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
+public class ADSProtocol extends MessageToMessageCodec<ByteBuf, AMSTCPPacket> {
private static final Logger LOGGER =
LoggerFactory.getLogger(ADSProtocol.class);
- private ConcurrentMap<Invoke, AMSTCPPaket> requests;
+ private ConcurrentMap<Invoke, AMSTCPPacket> requests;
public ADSProtocol() {
this.requests = new ConcurrentHashMap<>();
}
@Override
- protected void encode(ChannelHandlerContext channelHandlerContext,
AMSTCPPaket amstcpPaket, List<Object> out) throws Exception {
- Invoke invokeId = amstcpPaket.getAmsHeader().getInvokeId();
+ protected void encode(ChannelHandlerContext channelHandlerContext,
AMSTCPPacket amstcpPacket, List<Object> out) throws Exception {
+ Invoke invokeId = amstcpPacket.getAmsHeader().getInvokeId();
if (invokeId != Invoke.NONE) {
- requests.put(invokeId, amstcpPaket);
+ requests.put(invokeId, amstcpPacket);
}
- out.add(amstcpPaket.getByteBuf());
+ out.add(amstcpPacket.getByteBuf());
}
@@ -72,7 +72,7 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
DataLength dataLength = DataLength.of(byteBuf);
AMSError errorCode = AMSError.of(byteBuf);
Invoke invoke = Invoke.of(byteBuf);
- AMSTCPPaket correlatedAmstcpPacket = requests.remove(invoke);
+ AMSTCPPacket correlatedAmstcpPacket = requests.remove(invoke);
if (correlatedAmstcpPacket != null) {
LOGGER.debug("Correlated packet received {}",
correlatedAmstcpPacket);
}
@@ -82,21 +82,21 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
ByteBuf commandBuffer = byteBuf.readBytes((int)
dataLength.getAsLong());
AMSTCPHeader amstcpHeader = AMSTCPHeader.of(packetLength);
AMSHeader amsHeader = AMSHeader.of(targetAmsNetId, targetAmsPort,
sourceAmsNetId, sourceAmsPort, commandId, stateId, dataLength, errorCode,
invoke);
- final AMSTCPPaket amstcpPaket;
+ final AMSTCPPacket amstcpPacket;
switch (commandId) {
case Invalid:
- amstcpPaket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
+ amstcpPacket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
break;
case ADS_Read_Device_Info:
if (stateId.isRequest()) {
- amstcpPaket = ADSReadDeviceInfoRequest.of(amstcpHeader,
amsHeader);
+ amstcpPacket = ADSReadDeviceInfoRequest.of(amstcpHeader,
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);
- amstcpPaket = ADSReadDeviceInfoResponse.of(amstcpHeader,
amsHeader, result, majorVersion, minorVersion, version, device);
+ amstcpPacket = ADSReadDeviceInfoResponse.of(amstcpHeader,
amsHeader, result, majorVersion, minorVersion, version, device);
}
break;
case ADS_Read:
@@ -104,7 +104,7 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
IndexGroup indexGroup = IndexGroup.of(commandBuffer);
IndexOffset indexOffset = IndexOffset.of(commandBuffer);
Length length = Length.of(commandBuffer);
- amstcpPaket = ADSReadRequest.of(amstcpHeader, amsHeader,
indexGroup, indexOffset, length);
+ amstcpPacket = ADSReadRequest.of(amstcpHeader, amsHeader,
indexGroup, indexOffset, length);
} else {
Result result = Result.of(commandBuffer);
Length length = Length.of(commandBuffer);
@@ -114,7 +114,7 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amstcpPaket = ADSReadResponse.of(amstcpHeader, amsHeader,
result, length, data);
+ amstcpPacket = ADSReadResponse.of(amstcpHeader, amsHeader,
result, length, data);
}
break;
case ADS_Write:
@@ -128,18 +128,18 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amstcpPaket = ADSWriteRequest.of(amstcpHeader, amsHeader,
indexGroup, indexOffset, length, data);
+ amstcpPacket = ADSWriteRequest.of(amstcpHeader, amsHeader,
indexGroup, indexOffset, length, data);
} else {
Result result = Result.of(commandBuffer);
- amstcpPaket = ADSWriteResponse.of(amstcpHeader, amsHeader,
result);
+ amstcpPacket = ADSWriteResponse.of(amstcpHeader,
amsHeader, result);
}
break;
case ADS_Read_State:
if (stateId.isRequest()) {
- amstcpPaket = ADSReadStateRequest.of(amstcpHeader,
amsHeader);
+ amstcpPacket = ADSReadStateRequest.of(amstcpHeader,
amsHeader);
} else {
Result result = Result.of(commandBuffer);
- amstcpPaket = ADSReadStateResponse.of(amstcpHeader,
amsHeader, result);
+ amstcpPacket = ADSReadStateResponse.of(amstcpHeader,
amsHeader, result);
}
break;
case ADS_Write_Control:
@@ -155,10 +155,10 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amstcpPaket = ADSWriteControlRequest.of(amstcpHeader,
amsHeader, adsState, deviceState, length, data);
+ amstcpPacket = ADSWriteControlRequest.of(amstcpHeader,
amsHeader, adsState, deviceState, length, data);
} else {
Result result = Result.of(commandBuffer);
- amstcpPaket = ADSWriteControlResponse.of(amstcpHeader,
amsHeader, result);
+ amstcpPacket = ADSWriteControlResponse.of(amstcpHeader,
amsHeader, result);
}
break;
case ADS_Add_Device_Notification:
@@ -170,20 +170,20 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
MaxDelay maxDelay = MaxDelay.of(commandBuffer);
CycleTime cycleTime = CycleTime.of(commandBuffer);
commandBuffer.skipBytes(ADSAddDeviceNotificationRequest.Reserved.NUM_BYTES);
- amstcpPaket =
ADSAddDeviceNotificationRequest.of(amstcpHeader, amsHeader, indexGroup,
indexOffset, length, transmissionMode, maxDelay, cycleTime);
+ amstcpPacket =
ADSAddDeviceNotificationRequest.of(amstcpHeader, amsHeader, indexGroup,
indexOffset, length, transmissionMode, maxDelay, cycleTime);
} else {
Result result = Result.of(commandBuffer);
NotificationHandle notificationHandle =
NotificationHandle.of(commandBuffer);
- amstcpPaket =
ADSAddDeviceNotificationResponse.of(amstcpHeader, amsHeader, result,
notificationHandle);
+ amstcpPacket =
ADSAddDeviceNotificationResponse.of(amstcpHeader, amsHeader, result,
notificationHandle);
}
break;
case ADS_Delete_Device_Notification:
if (stateId.isRequest()) {
NotificationHandle notificationHandle =
NotificationHandle.of(commandBuffer);
- amstcpPaket =
ADSDeleteDeviceNotificationRequest.of(amstcpHeader, amsHeader,
notificationHandle);
+ amstcpPacket =
ADSDeleteDeviceNotificationRequest.of(amstcpHeader, amsHeader,
notificationHandle);
} else {
Result result = Result.of(commandBuffer);
- amstcpPaket =
ADSDeleteDeviceNotificationResponse.of(amstcpHeader, amsHeader, result);
+ amstcpPacket =
ADSDeleteDeviceNotificationResponse.of(amstcpHeader, amsHeader, result);
}
break;
case ADS_Device_Notification:
@@ -220,9 +220,9 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
AdsStampHeader adsStampHeader =
AdsStampHeader.of(timeStamp, samples, adsNotificationSamples);
adsStampHeaders.add(adsStampHeader);
}
- amstcpPaket =
ADSDeviceNotificationRequest.of(amstcpHeader, amsHeader, length, stamps,
adsStampHeaders);
+ amstcpPacket =
ADSDeviceNotificationRequest.of(amstcpHeader, amsHeader, length, stamps,
adsStampHeaders);
} else {
- amstcpPaket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
+ amstcpPacket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
}
break;
case ADS_Read_Write:
@@ -243,7 +243,7 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
byte[] dataToRead = new byte[(int) readLength.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amstcpPaket = ADSReadWriteRequest.of(amstcpHeader,
amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
+ amstcpPacket = ADSReadWriteRequest.of(amstcpHeader,
amsHeader, indexGroup, indexOffset, readLength, writeLength, data);
} else {
Result result = Result.of(commandBuffer);
Length length = Length.of(commandBuffer);
@@ -253,15 +253,15 @@ public class ADSProtocol extends
MessageToMessageCodec<ByteBuf, AMSTCPPaket> {
byte[] dataToRead = new byte[(int) length.getAsLong()];
commandBuffer.readBytes(dataToRead);
Data data = Data.of(dataToRead);
- amstcpPaket = ADSReadWriteResponse.of(amstcpHeader,
amsHeader, result, length, data);
+ amstcpPacket = ADSReadWriteResponse.of(amstcpHeader,
amsHeader, result, length, data);
}
break;
case UNKNOWN:
default:
- amstcpPaket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
+ amstcpPacket = UnknownCommand.of(amstcpHeader, amsHeader,
commandBuffer);
}
- out.add(amstcpPaket);
- LOGGER.trace("Set amstcpPaket {} to out", amstcpPaket);
+ out.add(amstcpPacket);
+ LOGGER.trace("Set amstcpPacket {} to out", amstcpPacket);
if (commandBuffer.readableBytes() > 0) {
throw new IllegalStateException("Unread bytes left: " +
commandBuffer.readableBytes());
}
diff --git
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java
index 871374d..e979eaa 100644
---
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java
+++
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java
@@ -26,7 +26,7 @@ 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.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
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;
@@ -56,7 +56,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
-public class Plc4XADSProtocol extends MessageToMessageCodec<AMSTCPPaket,
PlcRequestContainer<PlcRequest, PlcResponse>> {
+public class Plc4XADSProtocol extends MessageToMessageCodec<AMSTCPPacket,
PlcRequestContainer<PlcRequest, PlcResponse>> {
private static final Logger LOGGER =
LoggerFactory.getLogger(Plc4XADSProtocol.class);
@@ -114,8 +114,8 @@ public class Plc4XADSProtocol extends
MessageToMessageCodec<AMSTCPPaket, PlcRequ
}
byte[] bytes = byteArrayOutputStream.toByteArray();
Data data = Data.of(bytes);
- AMSTCPPaket amstcpPaket = ADSWriteRequest.of(targetAmsNetId,
targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup,
indexOffset, data);
- out.add(amstcpPaket);
+ AMSTCPPacket amstcpPacket = ADSWriteRequest.of(targetAmsNetId,
targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup,
indexOffset, data);
+ out.add(amstcpPacket);
requests.put(invokeId.getAsLong(), msg);
}
@@ -135,16 +135,16 @@ public class Plc4XADSProtocol extends
MessageToMessageCodec<AMSTCPPaket, PlcRequ
IndexGroup indexGroup = IndexGroup.of(adsAddress.getIndexGroup());
IndexOffset indexOffset = IndexOffset.of(adsAddress.getIndexOffset());
Length length = Length.of(readRequestItem.getSize());
- AMSTCPPaket amstcpPaket = ADSReadRequest.of(targetAmsNetId,
targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup,
indexOffset, length);
- out.add(amstcpPaket);
+ AMSTCPPacket amstcpPacket = ADSReadRequest.of(targetAmsNetId,
targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, indexGroup,
indexOffset, length);
+ out.add(amstcpPacket);
requests.put(invokeId.getAsLong(), msg);
}
@Override
- protected void decode(ChannelHandlerContext channelHandlerContext,
AMSTCPPaket amstcpPaket, List<Object> out) throws Exception {
- PlcRequestContainer<PlcRequest, PlcResponse> plcRequestContainer =
requests.remove(amstcpPaket.getAmsHeader().getInvokeId().getAsLong());
+ protected void decode(ChannelHandlerContext channelHandlerContext,
AMSTCPPacket amstcpPacket, List<Object> out) throws Exception {
+ PlcRequestContainer<PlcRequest, PlcResponse> plcRequestContainer =
requests.remove(amstcpPacket.getAmsHeader().getInvokeId().getAsLong());
if (plcRequestContainer == null) {
- LOGGER.info("Unmapped packet received {}", amstcpPaket);
+ LOGGER.info("Unmapped packet received {}", amstcpPacket);
return;
}
PlcRequest request = plcRequestContainer.getRequest();
@@ -152,16 +152,16 @@ public class Plc4XADSProtocol extends
MessageToMessageCodec<AMSTCPPaket, PlcRequ
// Handle the response to a read request.
if (request instanceof PlcReadRequest) {
- if (amstcpPaket instanceof ADSReadResponse) {
- response = decodeReadResponse((ADSReadResponse) amstcpPaket,
plcRequestContainer);
+ if (amstcpPacket instanceof ADSReadResponse) {
+ response = decodeReadResponse((ADSReadResponse) amstcpPacket,
plcRequestContainer);
} else {
- throw new PlcProtocolException("Wrong type correlated " +
amstcpPaket);
+ throw new PlcProtocolException("Wrong type correlated " +
amstcpPacket);
}
} else if (request instanceof PlcWriteRequest) {
- if (amstcpPaket instanceof ADSWriteResponse) {
- response = decodeWriteResponse((ADSWriteResponse) amstcpPaket,
plcRequestContainer);
+ if (amstcpPacket instanceof ADSWriteResponse) {
+ response = decodeWriteResponse((ADSWriteResponse)
amstcpPacket, plcRequestContainer);
} else {
- throw new PlcProtocolException("Wrong type correlated " +
amstcpPaket);
+ throw new PlcProtocolException("Wrong type correlated " +
amstcpPacket);
}
}
diff --git
a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java
index 02b683c..9a225e1 100644
---
a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java
+++
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java
@@ -21,7 +21,7 @@ package org.apache.plc4x.java.ads.netty;
import org.apache.commons.io.HexDump;
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.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
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;
@@ -51,7 +51,7 @@ public class ADSProtocolTest {
private ADSProtocol SUT;
@Parameterized.Parameter
- public AMSTCPPaket amstcpPaket;
+ public AMSTCPPacket amstcpPacket;
@Parameterized.Parameters(name = "{0} {index}")
public static Collection<Object[]> data() {
@@ -158,14 +158,14 @@ public class ADSProtocolTest {
targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
Unpooled.wrappedBuffer(new byte[]{42})
)*/
- ).map(amstcpPaket -> new
Object[]{amstcpPaket}).collect(Collectors.toList());
+ ).map(amstcpPacket -> new
Object[]{amstcpPacket}).collect(Collectors.toList());
}
@Before
public void setUp() throws Exception {
SUT = new ADSProtocol();
- byte[] bytes = amstcpPaket.getBytes();
- LOGGER.info("amstcpPaket:\n{} has \n{}bytes", amstcpPaket,
bytes.length);
+ byte[] bytes = amstcpPacket.getBytes();
+ LOGGER.info("amstcpPacket:\n{} has \n{}bytes", amstcpPacket,
bytes.length);
try (ByteArrayOutputStream byteArrayOutputStream = new
ByteArrayOutputStream()) {
HexDump.dump(bytes, 0, byteArrayOutputStream, 0);
byteArrayOutputStream.flush();
@@ -176,7 +176,7 @@ public class ADSProtocolTest {
@Test
public void encode() throws Exception {
ArrayList<Object> out = new ArrayList<>();
- SUT.encode(null, amstcpPaket, out);
+ SUT.encode(null, amstcpPacket, out);
assertEquals(1, out.size());
assertThat(out, hasSize(1));
}
@@ -184,7 +184,7 @@ public class ADSProtocolTest {
@Test
public void decode() throws Exception {
ArrayList<Object> out = new ArrayList<>();
- SUT.decode(null, amstcpPaket.getByteBuf(), out);
+ SUT.decode(null, amstcpPacket.getByteBuf(), out);
assertThat(out, hasSize(1));
}
diff --git
a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
index 96080a7..9a926dc 100644
---
a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
+++
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.plc4x.java.ads.netty;
-import org.apache.plc4x.java.ads.api.generic.AMSTCPPaket;
+import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket;
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;
@@ -90,7 +90,7 @@ public class Plc4XADSProtocolTest {
ArrayList<Object> in = new ArrayList<>();
SUT.encode(null, plcRequestContainer, in);
ArrayList<Object> out = new ArrayList<>();
- SUT.decode(null, ((AMSTCPPaket) in.get(0)), out);
+ SUT.decode(null, ((AMSTCPPacket) in.get(0)), out);
assertThat(out, hasSize(1));
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
sru...@apache.org.
