You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2017/12/28 00:47:38 UTC
[incubator-plc4x] branch master updated (aa3cb80 -> cbca3a3)
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from aa3cb80 add missing ASF headers
new efbc73c move API message tests to correct location
new aa993bb move API message tests to correct location
new d8e5584 clean up test
new bdaa5fb clean up tests
new 43e871c remove unneeded asserts
new 1dc888c remove unneeded imports
new c873aae remove unneeded imports
new 772554f remove unneeded imports
new 5915fe0 final before static
new af886eb remove unneeded import
new f2b0d77 add final where needed
new b88ea5f remove unneeded imports
new 6f56b52 no need for cast
new 6fa05fa add a few more tests
new ce1f208 add payload test
new 5af2d71 some more tests for coverage
new 3d1d195 added parameter test
new 039677c add a simple authenication test
new cbca3a3 add ASF header
The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 3 -
.../java/api/messages/PlcRequestContainer.java | 4 +-
.../PlcUsernamePasswordAuthenticationTest.java} | 18 ++--
.../plc4x/java/api/messages}/APIMessageTests.java | 27 +++---
.../plc4x/java/api/messages}/mock/MockAddress.java | 2 +-
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 6 +-
.../plc4x/java/isotp/netty/model/IsoTPMessage.java | 2 +-
.../netty/model/params/TpduSizeParameter.java | 2 +-
.../isotp/netty/model/params/TsapParameter.java | 6 +-
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 4 +-
.../java/isotp/netty/model/types/DeviceGroup.java | 2 +-
.../isotp/netty/model/types/DisconnectReason.java | 2 +-
.../isotp/netty/model/types/ParameterCode.java | 2 +-
.../isotp/netty/model/types/ProtocolClass.java | 2 +-
.../java/isotp/netty/model/types/RejectCause.java | 2 +-
.../java/isotp/netty/model/types/TpduCode.java | 2 +-
.../java/isotp/netty/model/types/TpduSize.java | 2 +-
.../java/org/apache/plc4x/java/netty/Message.java | 2 +-
.../plc4x/java/netty/events/S7ConnectionEvent.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 3 +-
.../java/s7/netty/model/params/VarParameter.java | 1 -
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../s7/netty/model/types/HeaderErrorClass.java | 2 +-
.../java/s7/netty/model/types/MemoryArea.java | 2 +-
.../java/s7/netty/model/types/ParameterError.java | 2 +-
.../java/s7/netty/model/types/ParameterType.java | 2 +-
.../s7/netty/model/types/SpecificationType.java | 2 +-
.../java/s7/netty/model/types/TransportSize.java | 2 +-
.../netty/model/types/VariableAddressingMode.java | 2 +-
.../isotp/netty/model/params/ParameterTests.java | 12 ---
.../isotp/netty/model/tpdus/IsotpModelTests.java | 35 +++++--
.../isotp/netty/model/types/IsotpTypeTests.java | 7 --
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 -
.../java/s7/connection/S7PlcConnectionTests.java | 2 -
.../s7/netty/model/messages/S7MessageTests.java | 101 ++++++++++++++++++++-
.../s7/netty/model/params/S7ParameterTests.java | 1 -
.../s7/netty/model/payloads/S7PayloadTests.java | 1 -
.../java/s7/netty/model/types/S7TypeTests.java | 34 +++++++
39 files changed, 217 insertions(+), 96 deletions(-)
copy plc4j/{protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java => api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java} (64%)
rename {integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items => plc4j/api/src/test/org/apache/plc4x/java/api/messages}/APIMessageTests.java (91%)
copy {integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent => plc4j/api/src/test/org/apache/plc4x/java/api/messages}/mock/MockAddress.java (96%)
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 08/19: remove unneeded imports
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 772554fef4695efd21122945040f10080a63ec6a
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:05:55 2017 +1100
remove unneeded imports
---
.../org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
index 2ecee99..3c8af0d 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
-import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 14/19: add a few more tests
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 6fa05fa93627000a58b2f8d444ac821f16071489
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 09:12:27 2017 +1100
add a few more tests
---
.../s7/netty/model/messages/S7MessageTests.java | 72 +++++++++++++++++++++-
1 file changed, 71 insertions(+), 1 deletion(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
index 5a1831a..ddd19a4 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
@@ -19,9 +19,15 @@ under the License.
package org.apache.plc4x.java.s7.netty.model.messages;
+import org.apache.plc4x.java.s7.netty.model.params.CpuServicesParameter;
import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
+import org.apache.plc4x.java.s7.netty.model.params.VarParameter;
+import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
+import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
-import org.apache.plc4x.java.s7.netty.model.types.MessageType;
+import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
+import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
+import org.apache.plc4x.java.s7.netty.model.types.*;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -57,6 +63,8 @@ class S7MessageTests {
assertTrue(message.getTpduReference() == tpduReference, "Unexpected tpdu value");
assertTrue(message.getMessageType() == MessageType.USER_DATA, "Unexpected message type");
+ assertTrue(message.getPayloads() == null, "Unexpected payloads");
+ assertTrue(message.getParameters() == null, "Unexpected parameters");
}
@Test
@@ -75,7 +83,69 @@ class S7MessageTests {
assertTrue(message.getMessageType() == MessageType.USER_DATA, "Unexpected message type");
assertTrue(message.getErrorClass() == 0x1, "Unexpected error class");
assertTrue(message.getErrorCode() == 0x23, "Unexpected error code");
+ assertTrue(message.getPayloads() == null, "Unexpected payloads");
+ assertTrue(message.getParameters() == null, "Unexpected parameters");
}
+ @Test
+ @Tag("fast")
+ void s7MessageParameters() {
+ MessageType messageType = MessageType.USER_DATA;
+ short tpduReference = 1;
+ ArrayList<S7Parameter> s7Parameters = new ArrayList<>();
+ ArrayList<S7Payload> s7Payloads = new ArrayList<>();
+ ParameterType parameterType = ParameterType.READ_VAR;
+ ArrayList<VarParameterItem> parameterItems = new ArrayList<>();
+ SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+ MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+ TransportSize transportSize = TransportSize.INT;
+ short numElements = 1;
+ byte dataBlock = (byte) 0x1;
+ byte byteOffset = (byte) 0x10;
+ byte bitOffset = (byte) 0x0;
+
+ parameterItems.add(new S7AnyVarParameterItem(specificationType, memoryArea, transportSize, numElements, dataBlock, byteOffset, bitOffset));
+
+ VarParameter varParameter = new VarParameter(parameterType, parameterItems);
+
+ s7Parameters.add(varParameter);
+
+ S7RequestMessage message = new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads);
+
+ assertTrue(message.getTpduReference() == tpduReference, "Unexpected tpdu value");
+ assertTrue(message.getMessageType() == MessageType.USER_DATA, "Unexpected message type");
+ assertTrue(message.getParameters().size() == 1, "Unexpected number of parameters");
+ assertTrue(message.getParameters().containsAll(s7Parameters), "Unexpected parameters");
+ assertTrue(message.getParameter(VarParameter.class).equals(varParameter), "Parameter missing");
+ assertTrue(message.getParameter(CpuServicesParameter.class) == null, "Contains unexpected parameter");
+ assertTrue(message.getPayloads().size() == 0, "Unexpected number of payloads");
+ }
+
+ @Test
+ @Tag("fast")
+ void s7MessagePayload() {
+ MessageType messageType = MessageType.USER_DATA;
+ short tpduReference = 1;
+ ArrayList<S7Parameter> s7Parameters = new ArrayList<>();
+ ArrayList<S7Payload> s7Payloads = new ArrayList<>();
+ ParameterType parameterType = ParameterType.WRITE_VAR;
+ ArrayList<VarPayloadItem> payloadItems = new ArrayList<>();
+ byte[] data = {(byte)0x79};
+ VarPayload varPayload;
+
+ payloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, data));
+ varPayload = new VarPayload(parameterType, payloadItems);
+ s7Payloads.add(varPayload);
+
+ S7RequestMessage message = new S7RequestMessage(messageType, tpduReference, s7Parameters, s7Payloads);
+
+ assertTrue(message.getTpduReference() == tpduReference, "Unexpected tpdu value");
+ assertTrue(message.getMessageType() == MessageType.USER_DATA, "Unexpected message type");
+ assertTrue(message.getPayloads().size() == 1, "Unexpected number of payloads");
+ assertTrue(message.getPayloads().containsAll(s7Payloads), "Unexpected payloads");
+ assertTrue(message.getPayload(VarPayload.class).equals(varPayload), "Payload missing");
+ assertTrue(message.getPayload(VarParameter.class) == null, "Contains unexpected payload"); // No other parameter classes
+ assertTrue(message.getParameters().size() == 0, "Unexpected number of parameters");
+ }
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 18/19: add a simple authenication test
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 039677cc3b51178860e2e2b6f758557d3686dbba
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 10:39:05 2017 +1100
add a simple authenication test
---
.../PlcUsernamePasswordAuthenticationTest.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java b/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
new file mode 100644
index 0000000..4275813
--- /dev/null
+++ b/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
@@ -0,0 +1,19 @@
+package org.apache.plc4x.java.api.authentication;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class PlcUsernamePasswordAuthenticationTest {
+
+ @Test
+ @Tag("fast")
+ void authenication() {
+ PlcUsernamePasswordAuthentication authenication = new PlcUsernamePasswordAuthentication("user", "password");
+
+ assertTrue(authenication.getUsername().equals("user"), "Unexpected user name");
+ assertTrue(authenication.getPassword().equals("password"), "Unexpected password");
+ }
+
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 04/19: clean up tests
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit bdaa5fb8c4bb9ead5ecfc96752dc1bb07478d0f0
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:04:23 2017 +1100
clean up tests
---
.../apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
index 3f53188..ad273d8 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
@@ -58,8 +58,7 @@ class IsotpModelTests {
@Test
@Tag("Fast")
void dataTpdu() {
- short destinationReference = 0x1;
- List<Parameter> parameters = Collections.emptyList();
+ List<Parameter> parameters = Collections.emptyList();
ByteBuf userData = Unpooled.buffer();
userData.writeByte(0x66);
@@ -67,7 +66,7 @@ class IsotpModelTests {
DataTpdu tpdu = new DataTpdu(true, (byte) 0x7F, parameters, userData);
assertTrue(tpdu.getTpduCode() == TpduCode.DATA);
- assertTrue(tpdu.isEot() == true, "Unexpected eot reference");
+ assertTrue(tpdu.isEot(), "Unexpected eot reference");
assertTrue(tpdu.getTpduRef() == 0x7F);
assertTrue(tpdu.getParameters().isEmpty(), "Unexpected parameters");
assertTrue(tpdu.getUserData().readByte() == (byte) 0x66, "Unexpected user data");
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 09/19: final before static
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5915fe0849d886df6bb7fffff32ee2960846b41a
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:13:14 2017 +1100
final before static
---
.../java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
index 351235b..88a9b63 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
@@ -32,9 +32,9 @@ import java.util.List;
public class IsoOnTcpProtocol extends MessageToMessageCodec<ByteBuf, IsoOnTcpMessage> {
- public final static byte ISO_ON_TCP_MAGIC_NUMBER = 0x03;
+ public static final byte ISO_ON_TCP_MAGIC_NUMBER = 0x03;
- private final static Logger logger = LoggerFactory.getLogger(IsoOnTcpProtocol.class);
+ private static final Logger logger = LoggerFactory.getLogger(IsoOnTcpProtocol.class);
@Override
protected void encode(ChannelHandlerContext ctx, IsoOnTcpMessage in, List<Object> out) throws Exception {
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 13/19: no need for cast
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 6f56b5277237e69597bf19412b4f4a53298f2cc6
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:40:29 2017 +1100
no need for cast
---
.../src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java
index 042245f..939880c 100644
--- a/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java
+++ b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java
@@ -179,7 +179,7 @@ class APIMessageTests {
PlcWriteRequest plcWriteRequest = new PlcWriteRequest(Byte.class, address, (byte) 0x33);
assertTrue(plcWriteRequest.getRequestItems().size() == 1, "Expected no request item");
assertTrue(plcWriteRequest.getNumItems() == 1, "Expected one request item");
- Object[] values = (Object[])plcWriteRequest.getRequestItems().get(0).getValues();
+ Object[] values = plcWriteRequest.getRequestItems().get(0).getValues();
assertTrue((byte)values[0] == (byte) 0x33, "Expected value 0x33");
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 16/19: some more tests for coverage
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5af2d71b7238f1d66ff8265dce59820fd8367f2d
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 09:45:19 2017 +1100
some more tests for coverage
---
.../java/s7/netty/model/types/S7TypeTests.java | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
index ee0a6b8..f05df22 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
@@ -37,11 +37,20 @@ class S7TypeTests {
@Test
@Tag("fast")
+ void unknownDataTransportErrorCode() {
+ DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
+
+ assertTrue(DataTransportErrorCode.valueOf((byte)0xFE) == null, "Unexpected value mapped");
+ }
+
+ @Test
+ @Tag("fast")
void dataTransportSize() {
DataTransportSize dataTransportSize = DataTransportSize.DINTEGER;
assertTrue(DataTransportSize.valueOf((byte)6) == DataTransportSize.DINTEGER, "6 incorrectly mapped");
assertTrue(dataTransportSize.getCode() == (byte)6, "code is not 6");
+ assertTrue(!dataTransportSize.isSizeInBits(), "Unexpected return from bit size");
}
@Test
@@ -76,6 +85,14 @@ class S7TypeTests {
@Test
@Tag("fast")
+ void unknownParameterType() {
+ ParameterType parameterType = ParameterType.UPLOAD;
+
+ assertTrue(ParameterType.valueOf((byte)0xFF) == null, "Unexpected value mapped");
+ }
+
+ @Test
+ @Tag("fast")
void specificationType() {
SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
@@ -100,4 +117,21 @@ class S7TypeTests {
assertTrue(VariableAddressingMode.valueOf((byte)0x19) == VariableAddressingMode.ALARM_ACK, "0x19 incorrectly mapped");
assertTrue(variableAddressingMode.getCode() == (byte)0x19, "code is not 0x19");
}
+
+ @Test
+ @Tag("fast")
+ void memoryAccess() {
+ MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+
+ assertTrue(memoryArea.valueOf((byte)0x84) == MemoryArea.DATA_BLOCKS, "0x84 incorrectly mapped");
+ assertTrue(memoryArea.getCode() == (byte)0x84, "code is not 0x84");
+ }
+
+ @Test
+ @Tag("fast")
+ void unknownMemoryAccess() {
+ MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+
+ assertTrue(memoryArea.valueOf((byte)0xFF) == null, "Unexpected value mapped");
+ }
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 06/19: remove unneeded imports
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 1dc888cff942424c30f94ea0fc85af642ed6ee28
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:05:08 2017 +1100
remove unneeded imports
---
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
index 90a0711..64d126f 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
@@ -19,9 +19,7 @@ under the License.
package org.apache.plc4x.java.s7.connection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.s7.model.S7Address;
import org.apache.plc4x.java.s7.model.S7BitAddress;
import org.apache.plc4x.java.s7.model.S7DataBlockAddress;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 07/19: remove unneeded imports
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit c873aaeb8652dcf55e11147147dffffedc98293f
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:05:26 2017 +1100
remove unneeded imports
---
.../org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
index 13b413c..ca4bb47 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
@@ -21,7 +21,6 @@ package org.apache.plc4x.java.s7.netty.model.params;
import org.apache.plc4x.java.s7.netty.model.params.items.S7AnyVarParameterItem;
import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
-import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
import org.apache.plc4x.java.s7.netty.model.types.SpecificationType;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 01/19: move API message tests to correct location
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit efbc73c9cdbe598acf3eb673c81f6deefaa42df0
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:03:10 2017 +1100
move API message tests to correct location
---
.../plc4x/java/api/messages/APIMessageTests.java | 214 +++++++++++++++++++++
.../plc4x/java/api/messages/mock/MockAddress.java | 51 +++++
2 files changed, 265 insertions(+)
diff --git a/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java
new file mode 100644
index 0000000..042245f
--- /dev/null
+++ b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/APIMessageTests.java
@@ -0,0 +1,214 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.plc4x.java.api.messages;
+
+import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
+import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
+import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
+import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
+import org.apache.plc4x.java.api.messages.mock.MockAddress;
+import org.apache.plc4x.java.api.types.ResponseCode;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class APIMessageTests {
+
+ @Test
+ @Tag("fast")
+ void readRequestItemSize() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
+ assertTrue(readRequestItem.getAddress().equals(address), "Unexpected address");
+ assertTrue(readRequestItem.getDatatype() == Byte.class, "Unexpected data type");
+ assertTrue(readRequestItem.getSize() == 1, "Unexpected size");
+ }
+
+ @Test
+ @Tag("fast")
+ void readRequestItem() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address);
+ assertTrue(readRequestItem.getAddress().equals(address), "Unexpected address");
+ assertTrue(readRequestItem.getDatatype() == Byte.class, "Unexpected data type");
+ assertTrue(readRequestItem.getSize() == 1, "Unexpected size");
+ }
+
+ @Test
+ @Tag("fast")
+ void readResponseItem() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
+ ReadResponseItem readResponseItem = new ReadResponseItem(readRequestItem, ResponseCode.OK, Collections.emptyList());
+ assertTrue(readResponseItem.getResponseCode() == ResponseCode.OK, "Unexpected response code");
+ assertTrue(readResponseItem.getValues().isEmpty(), "List should be empty");
+ assertTrue(readResponseItem.getRequestItem().equals(readRequestItem), "Unexpected read request item");
+ }
+
+ @Test
+ @Tag("fast")
+ void writeRequestItem() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, (byte) 0x45);
+ assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
+ assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
+ assertTrue((Byte) writeRequestItem.getValues()[0] == 0x45, "Unexpected value");
+ }
+
+ @Test
+ @Tag("fast")
+ void writeRequestItems() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ Byte data[] = { (byte) 0x23, (byte) 0x84 };
+ WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, data);
+ assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
+ assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
+ assertTrue((Byte) writeRequestItem.getValues()[0] == (byte) 0x23, "Unexpected value");
+ assertTrue((Byte) writeRequestItem.getValues()[1] == (byte) 0x84, "Unexpected value");
+ }
+
+ @Test
+ @Tag("fast")
+ void writeResponseItem() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, (byte) 0x3B);
+ WriteResponseItem writeResponseItem = new WriteResponseItem(writeRequestItem, ResponseCode.OK);
+ assertTrue(writeResponseItem.getResponseCode() == ResponseCode.OK, "Unexpected response code");
+ assertTrue(writeResponseItem.getRequestItem().equals(writeRequestItem), "Unexpected response item");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcReadRequestEmpty() {
+ PlcReadRequest plcReadRequest = new PlcReadRequest();
+ assertTrue(plcReadRequest.getReadRequestItems().isEmpty(), "Request items not empty");
+ assertTrue(plcReadRequest.getNumItems() == 0, "Expected request items to be zero");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcReadRequestAddress() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ PlcReadRequest plcReadRequest = new PlcReadRequest(Byte.class, address);
+ assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
+ assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcReadRequestSize() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ PlcReadRequest plcReadRequest = new PlcReadRequest(Byte.class, address, 1);
+ assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
+ assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcReadRequestAddItem() {
+ PlcReadRequest plcReadRequest = new PlcReadRequest();
+ assertTrue(plcReadRequest.getReadRequestItems().isEmpty(), "Request items not empty");
+ assertTrue(plcReadRequest.getNumItems() == 0, "Expected request items to be zero");
+ MockAddress address = new MockAddress("mock:/DATA");
+ ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
+ plcReadRequest.addItem(readRequestItem);
+ assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
+ assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcReadResponse() {
+ PlcReadRequest plcReadRequest = new PlcReadRequest();
+ ArrayList<ReadResponseItem> responseItems = new ArrayList<>();
+ MockAddress address = new MockAddress("mock:/DATA");
+ ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
+ ReadResponseItem readResponseItem = new ReadResponseItem(readRequestItem, ResponseCode.OK, Collections.emptyList());
+ responseItems.add(readResponseItem);
+ PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
+ assertTrue(plcReadResponse.getRequest().getNumItems() == 0, "Unexpected number of response items");
+ assertTrue(plcReadResponse.getRequest().equals(plcReadRequest), "Unexpected read request");
+ assertTrue(plcReadResponse.getResponseItems().size() == 1, "Unexpected number of response items");
+ assertTrue(plcReadResponse.getResponseItems().containsAll(responseItems), "Unexpected items in response items");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcWriteRequestItem() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, (byte) 0x45);
+
+ assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
+ assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
+ assertTrue((Byte) writeRequestItem.getValues()[0] == 0x45, "Unexpected value");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcWriteRequestEmpty() {
+ PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+ assertTrue(plcWriteRequest.getRequestItems().isEmpty(), "Request items not empty");
+ assertTrue(plcWriteRequest.getNumItems() == 0, "Expected request items to be zero");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcWriteRequestObject() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ PlcWriteRequest plcWriteRequest = new PlcWriteRequest(Byte.class, address, (byte) 0x33);
+ assertTrue(plcWriteRequest.getRequestItems().size() == 1, "Expected no request item");
+ assertTrue(plcWriteRequest.getNumItems() == 1, "Expected one request item");
+ Object[] values = (Object[])plcWriteRequest.getRequestItems().get(0).getValues();
+ assertTrue((byte)values[0] == (byte) 0x33, "Expected value 0x33");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcWriteRequestObjects() {
+ MockAddress address = new MockAddress("mock:/DATA");
+ Byte[] data = {(byte)0x22, (byte)0x66};
+ PlcWriteRequest plcWriteRequest = new PlcWriteRequest(Byte.class, address, data);
+ assertTrue(plcWriteRequest.getRequestItems().size() == 1, "Expected one request item");
+ assertTrue(plcWriteRequest.getNumItems() == 1, "Expected one request item");
+ Byte[] values = (Byte[])plcWriteRequest.getRequestItems().get(0).getValues();
+ assertTrue(values[0] == (byte) 0x22, "Expected value 0x22");
+ assertTrue(values[1] == (byte) 0x66, "Expected value 0x66");
+ }
+
+ @Test
+ @Tag("fast")
+ void plcWriteResponse() {
+ PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
+ ArrayList<WriteResponseItem> responseItems = new ArrayList<>();
+ MockAddress address = new MockAddress("mock:/DATA");
+ WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, 1);
+ WriteResponseItem writeResponseItem = new WriteResponseItem(writeRequestItem, ResponseCode.OK);
+ responseItems.add(writeResponseItem);
+ PlcWriteResponse plcReadResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
+ assertTrue(plcReadResponse.getRequest().getNumItems() == 0, "Unexpected number of response items");
+ assertTrue(plcReadResponse.getRequest().equals(plcWriteRequest), "Unexpected read request");
+ assertTrue(plcReadResponse.getResponseItems().size() == 1, "Unexpected number of response items");
+ assertTrue(plcReadResponse.getResponseItems().containsAll(responseItems), "Unexpected items in response items");
+ }
+}
diff --git a/plc4j/api/src/test/org/apache/plc4x/java/api/messages/mock/MockAddress.java b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/mock/MockAddress.java
new file mode 100644
index 0000000..44ad2c1
--- /dev/null
+++ b/plc4j/api/src/test/org/apache/plc4x/java/api/messages/mock/MockAddress.java
@@ -0,0 +1,51 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.java.api.messages.mock;
+
+import org.apache.plc4x.java.api.model.Address;
+
+public class MockAddress implements Address {
+ private final String address;
+
+ public MockAddress(String address) {
+ this.address = address;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ @Override
+ public String toString() {
+ return "mock address: "+address;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return o != null
+ && o instanceof MockAddress
+ && ((MockAddress)o).address.equals(this.address);
+ }
+
+ @Override
+ public int hashCode() {
+ return address.hashCode();
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 15/19: add payload test
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit ce1f208a8b41ece936f23b77790ae84f05c4d73f
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 09:44:40 2017 +1100
add payload test
---
.../s7/netty/model/messages/S7MessageTests.java | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
index ddd19a4..0294ccd 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
@@ -148,4 +148,33 @@ class S7MessageTests {
assertTrue(message.getParameters().size() == 0, "Unexpected number of parameters");
}
+ @Test
+ @Tag("fast")
+ void s7AnyVarParameterItem() {
+ MessageType messageType = MessageType.USER_DATA;
+ short tpduReference = 1;
+ ArrayList<S7Parameter> s7Parameters = new ArrayList<>();
+ ArrayList<S7Payload> s7Payloads = new ArrayList<>();
+ ParameterType parameterType = ParameterType.READ_VAR;
+ ArrayList<VarParameterItem> parameterItems = new ArrayList<>();
+ SpecificationType specificationType = SpecificationType.VARIABLE_SPECIFICATION;
+ MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
+ TransportSize transportSize = TransportSize.INT;
+ short numElements = 1;
+ byte dataBlock = (byte) 0x1;
+ byte byteOffset = (byte) 0x10;
+ byte bitOffset = (byte) 0x0;
+
+ S7AnyVarParameterItem parameterItem = new S7AnyVarParameterItem(specificationType, memoryArea, transportSize, numElements, dataBlock, byteOffset, bitOffset);
+
+ assertTrue(parameterItem.getSpecificationType() == specificationType, "Unexpected specification type");
+ assertTrue(parameterItem.getMemoryArea() == MemoryArea.DATA_BLOCKS, "Unexpected memory area");
+ assertTrue(parameterItem.getTransportSize() == transportSize, "Unexpected transport size");
+ assertTrue(parameterItem.getNumElements() == numElements, "Unexpected number elements");
+ assertTrue(parameterItem.getDataBlockNumber() == dataBlock, "Unexpected data block");
+ assertTrue(parameterItem.getByteOffset() == byteOffset, "Unexpected byte offset");
+ assertTrue(parameterItem.getBitOffset() == bitOffset, "Unexpected bit offset");
+ assertTrue(parameterItem.getAddressingMode() == VariableAddressingMode.S7ANY, "Unexpected adressing mode");
+ }
+
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 03/19: clean up test
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d8e5584c94ca9a234849573087c1d048066c1838
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:04:01 2017 +1100
clean up test
---
.../plc4x/java/isotp/netty/model/params/ParameterTests.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/ParameterTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/ParameterTests.java
index 664212e..8bbb052 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/ParameterTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/ParameterTests.java
@@ -19,7 +19,6 @@ under the License.
package org.apache.plc4x.java.isotp.netty.model.params;
-import org.apache.plc4x.java.isotp.netty.model.types.DeviceGroup;
import org.apache.plc4x.java.isotp.netty.model.types.ParameterCode;
import org.apache.plc4x.java.isotp.netty.model.types.TpduSize;
import org.junit.jupiter.api.*;
@@ -27,17 +26,6 @@ import org.junit.jupiter.api.*;
import static org.junit.jupiter.api.Assertions.*;
class ParameterTest {
- private ParameterTest tsapParaameter;
-
- @BeforeEach
- void setUp() {
- }
-
- @AfterEach
- void tearDown() {
- tsapParaameter = null;
- }
-
@Test
@Tag("fast")
void checksumPartameter() {
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 19/19: add ASF header
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit cbca3a339cf6f42cf9e8354db767ccfc9a8ad7a2
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 10:44:08 2017 +1100
add ASF header
---
.../PlcUsernamePasswordAuthenticationTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java b/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
index 4275813..fc1c458 100644
--- a/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
+++ b/plc4j/api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java
@@ -1,3 +1,21 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
package org.apache.plc4x.java.api.authentication;
import org.junit.jupiter.api.Tag;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 12/19: remove unneeded imports
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit b88ea5fc2c3f72936bf93a4518a66a1da9b1f61d
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:37:05 2017 +1100
remove unneeded imports
---
.../src/main/java/org/apache/plc4x/camel/PLC4XProducer.java | 3 ---
.../s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 --
2 files changed, 5 deletions(-)
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
index 944f339..29331d2 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
@@ -28,13 +28,10 @@ import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
-
public class PLC4XProducer extends DefaultAsyncProducer implements ShutdownAware {
private static final Logger LOG = LoggerFactory.getLogger(PLC4XProducer.class);
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
index 6891ba8..a19bb22 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
@@ -23,12 +23,10 @@ import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Scanner;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 10/19: remove unneeded import
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit af886eb9a4d838782021040397ce18778e0cf0dc
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:28:32 2017 +1100
remove unneeded import
---
.../java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
index 2a69e6a..bf2ee4c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/VarParameter.java
@@ -21,7 +21,6 @@ package org.apache.plc4x.java.s7.netty.model.params;
import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
import org.apache.plc4x.java.s7.netty.model.types.ParameterType;
-import java.util.LinkedList;
import java.util.List;
public class VarParameter implements S7Parameter {
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 11/19: add final where needed
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit f2b0d7757796914d1702c766eb32ce889a2f030e
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:35:03 2017 +1100
add final where needed
---
.../org/apache/plc4x/java/api/messages/PlcRequestContainer.java | 4 ++--
.../main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java | 6 +++---
.../java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java | 2 +-
.../plc4x/java/isotp/netty/model/params/TpduSizeParameter.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/params/TsapParameter.java | 6 +++---
.../java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 4 ++--
.../org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/ParameterCode.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java | 2 +-
.../s7/src/main/java/org/apache/plc4x/java/netty/Message.java | 2 +-
.../java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java | 2 +-
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 3 +--
.../apache/plc4x/java/s7/netty/model/types/DataTransportSize.java | 4 ++--
.../apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java | 2 +-
.../java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/ParameterError.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/ParameterType.java | 2 +-
.../apache/plc4x/java/s7/netty/model/types/SpecificationType.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/TransportSize.java | 2 +-
.../plc4x/java/s7/netty/model/types/VariableAddressingMode.java | 2 +-
24 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
index 5fb7ccf..26d5418 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CompletableFuture;
public class PlcRequestContainer<T extends PlcRequest, R extends PlcResponse> {
- private T request;
- private CompletableFuture<R> responseFuture;
+ private final T request;
+ private final CompletableFuture<R> responseFuture;
public PlcRequestContainer(T request, CompletableFuture<R> responseFuture) {
this.request = request;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
index 010029f..2630cf0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
@@ -41,9 +41,9 @@ public class IsoTPProtocol extends MessageToMessageCodec<IsoOnTcpMessage, Tpdu>
private final static Logger logger = LoggerFactory.getLogger(IsoTPProtocol.class);
- private byte rackNo;
- private byte slotNo;
- private TpduSize tpduSize;
+ private final byte rackNo;
+ private final byte slotNo;
+ private final TpduSize tpduSize;
private CalledTsapParameter calledTsapParameter;
private TpduSizeParameter tpduSizeParameter;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
index 07f5106..98899cf 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
@@ -24,7 +24,7 @@ import org.apache.plc4x.java.netty.Message;
public class IsoTPMessage extends Message {
- private Tpdu tpdu;
+ private final Tpdu tpdu;
public IsoTPMessage(Tpdu tpdu, ByteBuf userData) {
super(userData);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
index e1c6af3..146b8ad 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
@@ -23,7 +23,7 @@ import org.apache.plc4x.java.isotp.netty.model.types.TpduSize;
public class TpduSizeParameter implements Parameter {
- private TpduSize tpduSize;
+ private final TpduSize tpduSize;
public TpduSizeParameter(TpduSize tpduSize) {
this.tpduSize = tpduSize;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
index 854c01e..2d7f2d2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
@@ -23,9 +23,9 @@ import org.apache.plc4x.java.isotp.netty.model.types.DeviceGroup;
public abstract class TsapParameter implements Parameter {
- private DeviceGroup deviceGroup;
- private byte rackNumber;
- private byte slotNumber;
+ private final DeviceGroup deviceGroup;
+ private final byte rackNumber;
+ private final byte slotNumber;
public TsapParameter(DeviceGroup deviceGroup, byte rackNumber, byte slotNumber) {
this.deviceGroup = deviceGroup;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
index 98f6f96..92f8c78 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
@@ -27,8 +27,8 @@ import java.util.List;
public abstract class Tpdu extends Message {
- private TpduCode tpduCode;
- private List<Parameter> parameters;
+ private final TpduCode tpduCode;
+ private final List<Parameter> parameters;
public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData) {
super(userData);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
index b90d4d2..63bdb0e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
@@ -26,7 +26,7 @@ public enum DeviceGroup {
OS((byte) 0x02),
OTHERS((byte) 0x03);
- private byte code;
+ private final byte code;
DeviceGroup(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
index 12272ce..637ce21 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
@@ -39,7 +39,7 @@ public enum DisconnectReason {
CONNECTION_REQUEST_REFUSED((byte) 0x88),
HEADER_OR_PARAMETER_LENGTH_INVALID((byte) 0x8A);
- private byte code;
+ private final byte code;
DisconnectReason(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
index 8099a1f..a56e146 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
@@ -50,7 +50,7 @@ public enum ParameterCode {
PREFERRED_MAX_PDU_SIZE((byte) 0xF0),
INACTIVITY_TIMER((byte) 0xF2);
- private byte code;
+ private final byte code;
ParameterCode(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
index 7bc8b07..05dc2f4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
@@ -28,7 +28,7 @@ public enum ProtocolClass {
CLASS_3((byte) 0x30),
CLASS_4((byte) 0x40);
- private byte code;
+ private final byte code;
ProtocolClass(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
index 69e69d6..f061afc 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
@@ -27,7 +27,7 @@ public enum RejectCause {
INVALID_TPDU_TYPE((byte) 0x02),
INVALID_PARAMETER_TYPE((byte) 0x03);
- private byte code;
+ private final byte code;
RejectCause(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
index 58e84c2..113f32e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
@@ -33,7 +33,7 @@ public enum TpduCode {
REJECT((byte) 0x50),
TPDU_ERROR((byte) 0x70);
- private byte code;
+ private final byte code;
TpduCode(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
index 6576745..57dd19c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
@@ -30,7 +30,7 @@ public enum TpduSize {
SIZE_256((byte) 0x08),
SIZE_128((byte) 0x07);
- private byte code;
+ private final byte code;
TpduSize(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
index 99b8c40..a9c39fb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
@@ -22,7 +22,7 @@ import io.netty.buffer.ByteBuf;
public class Message {
- private ByteBuf userData;
+ private final ByteBuf userData;
public Message(ByteBuf userData) {
this.userData = userData;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
index f27d8b2..a81ba6a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.netty.events;
public class S7ConnectionEvent {
- private S7ConnectionState state;
+ private final S7ConnectionState state;
public S7ConnectionEvent() {
this(S7ConnectionState.INITIAL);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index d4c06b2..55e13e1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -67,8 +67,7 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
private final String hostName;
private final int rack;
private final int slot;
-
- private int pduSize;
+ private final int pduSize;
private EventLoopGroup workerGroup;
private Channel channel;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
index ef5252c..9992c0f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
@@ -33,8 +33,8 @@ public enum DataTransportSize {
REAL((byte) 0x07, false),
OCTET_STRING((byte) 0x09, false);
- private byte code;
- private boolean sizeInBits;
+ private final byte code;
+ private final boolean sizeInBits;
DataTransportSize(byte code, boolean sizeInBits) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
index 9ceec04..3859b82 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
@@ -27,7 +27,7 @@ public enum HeaderErrorClass {
ERROR_ON_SUPPLIES((byte) 0x85),
ACCESS_ERROR((byte) 0x87);
- private byte code;
+ private final byte code;
HeaderErrorClass(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
index 4d9fb88..1e6042a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
@@ -42,7 +42,7 @@ public enum MemoryArea {
S7_200_IEC_COUNTERS((byte) 0x1E), /* Renamed from "IEC counters (200 family)" */
S7_200_IEC_TIMERS((byte) 0x1F); /* Renamed from "IEC timers (200 family)" */
- private byte code;
+ private final byte code;
MemoryArea(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
index da9c84c..564d9b3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
@@ -42,7 +42,7 @@ public enum ParameterError {
L7_UNKNOWN_REQUEST((short) 0xD802),
L7_INVALID_REQUEST_STATUS((short) 0xD803);
- private short code;
+ private final short code;
ParameterError(short code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index a71282a..84b9629 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -38,7 +38,7 @@ public enum ParameterType {
PLC_STOP((byte) 0x29),
SETUP_COMMUNICATION((byte) 0xF0);
- private byte code;
+ private final byte code;
ParameterType(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
index 7e4c6f7..8d22cb7 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
@@ -27,7 +27,7 @@ import java.util.Map;
public enum SpecificationType {
VARIABLE_SPECIFICATION((byte) 0x12);
- private byte code;
+ private final byte code;
SpecificationType(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index 9632f50..3836e2c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -43,7 +43,7 @@ public enum TransportSize {
IEC_COUNTER((byte) 0x1F),
HS_COUNTER((byte) 0x20);
- private byte code;
+ private final byte code;
TransportSize(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
index 14e4337..99e926a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
@@ -38,7 +38,7 @@ public enum VariableAddressingMode {
DBREAD((byte) 0xb0),
SYM1200((byte) 0xb2); /* Renamed from "1200SYM" */
- private byte code;
+ private final byte code;
VariableAddressingMode(byte code) {
this.code = code;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 05/19: remove unneeded asserts
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 43e871c235faafd62536c06056966e03fd2cbc7a
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:04:43 2017 +1100
remove unneeded asserts
---
.../apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java
index cd55011..8a91e01 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java
@@ -32,15 +32,12 @@ class IsotpTypeTests {
DeviceGroup deviceGroup;
deviceGroup = DeviceGroup.PG_OR_PC;
- assertTrue(deviceGroup == DeviceGroup.PG_OR_PC, "1 incorrectly mapped");
assertTrue(deviceGroup.getCode() == (byte)1, "code is not 1");
deviceGroup = DeviceGroup.OS;
- assertTrue(deviceGroup == DeviceGroup.OS, "2 incorrectly mapped");
assertTrue(deviceGroup.getCode() == (byte)2, "code is not 2");
deviceGroup = DeviceGroup.OTHERS;
- assertTrue(deviceGroup == DeviceGroup.OTHERS, "3 incorrectly mapped");
assertTrue(deviceGroup.getCode() == (byte)3, "code is not 3");
}
@@ -93,19 +90,15 @@ class IsotpTypeTests {
ProtocolClass protocolClass;
protocolClass = ProtocolClass.CLASS_1;
- assertTrue(protocolClass == ProtocolClass.CLASS_1, "0x10 incorrectly mapped");
assertTrue(protocolClass.getCode() == (byte)0x10, "code is not 0x10");
protocolClass = ProtocolClass.CLASS_2;
- assertTrue(protocolClass == ProtocolClass.CLASS_2, "0x20 incorrectly mapped");
assertTrue(protocolClass.getCode() == (byte)0x20, "code is not 0x20");
protocolClass = ProtocolClass.CLASS_3;
- assertTrue(protocolClass == ProtocolClass.CLASS_3, "0x30 incorrectly mapped");
assertTrue(protocolClass.getCode() == (byte)0x30, "code is not 0x30");
protocolClass = ProtocolClass.CLASS_4;
- assertTrue(protocolClass == ProtocolClass.CLASS_4, "0x40 incorrectly mapped");
assertTrue(protocolClass.getCode() == (byte)0x40, "code is not 0x40");
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 02/19: move API message tests to correct location
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit aa993bb64d6577a1dbf20d44af17ac217ad27e5e
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:03:29 2017 +1100
move API message tests to correct location
---
.../java/api/messages/items/APIMessageTests.java | 215 ---------------------
1 file changed, 215 deletions(-)
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items/APIMessageTests.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items/APIMessageTests.java
deleted file mode 100644
index f67112c..0000000
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items/APIMessageTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-package org.apache.plc4x.java.api.messages.items;
-
-import org.apache.plc4x.edgent.mock.MockAddress;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.types.ResponseCode;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class APIMessageTests {
-
- @Test
- @Tag("fast")
- void readRequestItemSize() {
- MockAddress address = new MockAddress("mock:/DATA");
- ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
- assertTrue(readRequestItem.getAddress().equals(address), "Unexpected address");
- assertTrue(readRequestItem.getDatatype() == Byte.class, "Unexpected data type");
- assertTrue(readRequestItem.getSize() == 1, "Unexpected size");
- }
-
- @Test
- @Tag("fast")
- void readRequestItem() {
- MockAddress address = new MockAddress("mock:/DATA");
- ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address);
- assertTrue(readRequestItem.getAddress().equals(address), "Unexpected address");
- assertTrue(readRequestItem.getDatatype() == Byte.class, "Unexpected data type");
- assertTrue(readRequestItem.getSize() == 1, "Unexpected size");
- }
-
- @Test
- @Tag("fast")
- void readResponseItem() {
- MockAddress address = new MockAddress("mock:/DATA");
- ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
- ReadResponseItem readResponseItem = new ReadResponseItem(readRequestItem, ResponseCode.OK, Collections.emptyList());
- assertTrue(readResponseItem.getResponseCode() == ResponseCode.OK, "Unexpected response code");
- assertTrue(readResponseItem.getValues().isEmpty(), "List should be empty");
- assertTrue(readResponseItem.getRequestItem().equals(readRequestItem), "Unexpected read request item");
- }
-
- @Test
- @Tag("fast")
- void writeRequestItem() {
- MockAddress address = new MockAddress("mock:/DATA");
- WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, (byte) 0x45);
- assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
- assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
- assertTrue((Byte) writeRequestItem.getValues()[0] == 0x45, "Unexpected value");
- }
-
- @Test
- @Tag("fast")
- void writeRequestItems() {
- MockAddress address = new MockAddress("mock:/DATA");
- Byte data[] = { new Byte((byte) 0x23), new Byte((byte) 0x84) };
- WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, data);
- assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
- assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
- assertTrue((Byte) writeRequestItem.getValues()[0] == (byte) 0x23, "Unexpected value");
- assertTrue((Byte) writeRequestItem.getValues()[1] == (byte) 0x84, "Unexpected value");
- }
-
- @Test
- @Tag("fast")
- void writeResponseItem() {
- MockAddress address = new MockAddress("mock:/DATA");
- WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, new Byte((byte) 0x3B));
- WriteResponseItem writeResponseItem = new WriteResponseItem(writeRequestItem, ResponseCode.OK);
- assertTrue(writeResponseItem.getResponseCode() == ResponseCode.OK, "Unexpected response code");
- assertTrue((Boolean) writeResponseItem.getRequestItem().equals(writeRequestItem), "Unexpected response item");
- }
-
- @Test
- @Tag("fast")
- void plcReadRequestEmpty() {
- PlcReadRequest plcReadRequest = new PlcReadRequest();
- assertTrue(plcReadRequest.getReadRequestItems().isEmpty(), "Request items not empty");
- assertTrue(plcReadRequest.getNumItems() == 0, "Expected request items to be zero");
- }
-
- @Test
- @Tag("fast")
- void plcReadRequestAddress() {
- MockAddress address = new MockAddress("mock:/DATA");
- PlcReadRequest plcReadRequest = new PlcReadRequest(Byte.class, address);
- assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
- assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
- }
-
- @Test
- @Tag("fast")
- void plcReadRequestSize() {
- MockAddress address = new MockAddress("mock:/DATA");
- PlcReadRequest plcReadRequest = new PlcReadRequest(Byte.class, address, 1);
- assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
- assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
- }
-
- @Test
- @Tag("fast")
- void plcReadRequestAddItem() {
- PlcReadRequest plcReadRequest = new PlcReadRequest();
- assertTrue(plcReadRequest.getReadRequestItems().isEmpty(), "Request items not empty");
- assertTrue(plcReadRequest.getNumItems() == 0, "Expected request items to be zero");
- MockAddress address = new MockAddress("mock:/DATA");
- ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
- plcReadRequest.addItem(readRequestItem);
- assertTrue(plcReadRequest.getReadRequestItems().size() == 1, "Expected one request item");
- assertTrue(plcReadRequest.getNumItems() == 1, "Expected one request item");
- }
-
- @Test
- @Tag("fast")
- void plcReadResponse() {
- PlcReadRequest plcReadRequest = new PlcReadRequest();
- ArrayList<ReadResponseItem> responseItems = new ArrayList<>();
- MockAddress address = new MockAddress("mock:/DATA");
- ReadRequestItem readRequestItem = new ReadRequestItem(Byte.class, address, 1);
- ReadResponseItem readResponseItem = new ReadResponseItem(readRequestItem, ResponseCode.OK, Collections.emptyList());
- responseItems.add(readResponseItem);
- PlcReadResponse plcReadResponse = new PlcReadResponse(plcReadRequest, responseItems);
- assertTrue(plcReadResponse.getRequest().getNumItems() == 0, "Unexpected number of response items");
- assertTrue(plcReadResponse.getRequest().equals(plcReadRequest), "Unexpected read request");
- assertTrue(plcReadResponse.getResponseItems().size() == 1, "Unexpected number of response items");
- assertTrue(plcReadResponse.getResponseItems().containsAll(responseItems), "Unexpected items in response items");
- }
-
- @Test
- @Tag("fast")
- void plcWriteRequestItem() {
- MockAddress address = new MockAddress("mock:/DATA");
- WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, (byte) 0x45);
- PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
-
- assertTrue(writeRequestItem.getAddress().equals(address), "Unexpected address");
- assertTrue(writeRequestItem.getDatatype() == Byte.class, "Unexpected data type");
- assertTrue((Byte) writeRequestItem.getValues()[0] == 0x45, "Unexpected value");
- }
-
- @Test
- @Tag("fast")
- void plcWriteRequestEmpty() {
- PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
- assertTrue(plcWriteRequest.getRequestItems().isEmpty(), "Request items not empty");
- assertTrue(plcWriteRequest.getNumItems() == 0, "Expected request items to be zero");
- }
-
- @Test
- @Tag("fast")
- void plcWriteRequestObject() {
- MockAddress address = new MockAddress("mock:/DATA");
- PlcWriteRequest plcWriteRequest = new PlcWriteRequest(Byte.class, address, new Byte((byte) 0x33));
- assertTrue(plcWriteRequest.getRequestItems().size() == 1, "Expected no request item");
- assertTrue(plcWriteRequest.getNumItems() == 1, "Expected one request item");
- Object[] values = (Object[])plcWriteRequest.getRequestItems().get(0).getValues();
- assertTrue((byte)values[0] == (byte) 0x33, "Expected value 0x33");
- }
-
- @Test
- @Tag("fast")
- void plcWriteRequestObjects() {
- MockAddress address = new MockAddress("mock:/DATA");
- Byte[] data = {new Byte((byte)0x22), new Byte((byte)0x66)};
- PlcWriteRequest plcWriteRequest = new PlcWriteRequest(Byte.class, address, data);
- assertTrue(plcWriteRequest.getRequestItems().size() == 1, "Expected one request item");
- assertTrue(plcWriteRequest.getNumItems() == 1, "Expected one request item");
- Byte[] values = (Byte[])plcWriteRequest.getRequestItems().get(0).getValues();
- assertTrue(values[0] == (byte) 0x22, "Expected value 0x22");
- assertTrue(values[1] == (byte) 0x66, "Expected value 0x66");
- }
-
- @Test
- @Tag("fast")
- void plcWriteResponse() {
- PlcWriteRequest plcWriteRequest = new PlcWriteRequest();
- ArrayList<WriteResponseItem> responseItems = new ArrayList<>();
- MockAddress address = new MockAddress("mock:/DATA");
- WriteRequestItem writeRequestItem = new WriteRequestItem(Byte.class, address, 1);
- WriteResponseItem writeResponseItem = new WriteResponseItem(writeRequestItem, ResponseCode.OK);
- responseItems.add(writeResponseItem);
- PlcWriteResponse plcReadResponse = new PlcWriteResponse(plcWriteRequest, responseItems);
- assertTrue(plcReadResponse.getRequest().getNumItems() == 0, "Unexpected number of response items");
- assertTrue(plcReadResponse.getRequest().equals(plcWriteRequest), "Unexpected read request");
- assertTrue(plcReadResponse.getResponseItems().size() == 1, "Unexpected number of response items");
- assertTrue(plcReadResponse.getResponseItems().containsAll(responseItems), "Unexpected items in response items");
- }
-}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 17/19: added parameter test
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3d1d1956f855f20f54c1ceb7e5fda9c1af765a43
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 10:31:08 2017 +1100
added parameter test
---
.../isotp/netty/model/tpdus/IsotpModelTests.java | 30 +++++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
index ad273d8..8cee347 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
@@ -21,14 +21,15 @@ package org.apache.plc4x.java.isotp.netty.model.tpdus;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.isotp.netty.model.params.CallingTsapParameter;
+import org.apache.plc4x.java.isotp.netty.model.params.ChecksumParameter;
import org.apache.plc4x.java.isotp.netty.model.params.Parameter;
-import org.apache.plc4x.java.isotp.netty.model.types.DisconnectReason;
-import org.apache.plc4x.java.isotp.netty.model.types.ProtocolClass;
-import org.apache.plc4x.java.isotp.netty.model.types.RejectCause;
-import org.apache.plc4x.java.isotp.netty.model.types.TpduCode;
+import org.apache.plc4x.java.isotp.netty.model.params.TpduSizeParameter;
+import org.apache.plc4x.java.isotp.netty.model.types.*;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -57,6 +58,27 @@ class IsotpModelTests {
@Test
@Tag("Fast")
+ void errorTpduParameter() {
+ short destinationReference = 0x1;
+ RejectCause rejectCause = RejectCause.REASON_NOT_SPECIFIED;
+ ArrayList<Parameter> parameters = new ArrayList<>();
+ ByteBuf userData = Unpooled.buffer();
+
+ userData.writeByte(0x7F);
+
+ ErrorTpdu tpdu = new ErrorTpdu(destinationReference, rejectCause, parameters, userData);
+
+ parameters.add(new TpduSizeParameter(TpduSize.SIZE_1024));
+ parameters.add(new ChecksumParameter((byte)0xFF));
+
+ assertTrue(tpdu.getParameters().size() == 2, "Unexpected number of parameters");
+ assertTrue(tpdu.getParameters().containsAll(parameters), "Unexpected parameter");
+ assertTrue(tpdu.getParameter(ChecksumParameter.class) != null, "Checksum parameter should exist");
+ assertTrue(tpdu.getParameter(CallingTsapParameter.class) == null, "CallingTsapParameter parameter should not exist");
+ }
+
+ @Test
+ @Tag("Fast")
void dataTpdu() {
List<Parameter> parameters = Collections.emptyList();
ByteBuf userData = Unpooled.buffer();
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.