This is an automated email from the ASF dual-hosted git repository. sruehl pushed a change to branch feature/Beckhoff_ADS_protocol in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 1833df7 + continued on plc protocol layer + added readable error codes from specification. add 51b5db3 PLC4X-18 - Implement a Netty Pipeline that allows creating pipelines for low level protocols below TCP and UDP - Some more work on the raw socket netty support add e3d87d1 Simplified the plc logger code add 4bd1219 Simplified the S7PlcReaderSample add d9b993f Some more work on the dummy driver - Should now use the "dummy" connection prefix - Should use a raw socket to send an ICMP (Ping) packet add 21e6f78 Exposed a parseAddress method on the connection-adapter add a167e3e Implemented an example using PLC4X and Edgent to publish PLC values directly to kafka add 1a6cbb6 Implemented an example using PLC4X and Edgent to publish PLC values directly to kafka add c78f052 Implemented an example using PLC4X and Edgent to publish PLC values directly to kafka add c97330a PLC4X-29 - [S7] Implement PDU Fragmentation add a69e14e PLC4X-29 - [S7] Implement PDU Fragmentation add e518156 Fixed some SonarQube complaints add 86da20c Ported the entire project to use JUnit4 add 98c0665 Ported the entire project to use JUnit4 - Fixed some invalidly ported assertions add d1c1e63 PLC4X-3 - Implement a testing framework for protocols add acd9f40 PLC4X-3 - Implement a testing framework for protocols add d260f0d PLC4X-3 - Implement a testing framework for protocols add c451106 Changed the build to only do the sonar analysis on develop (Otherwise the commits on branches overwrite the develop results) add 2912001 Fixed some sonar findings. add 4f45070 Made jenkins run sonar and deploy snapshots on the master branch instead of "develop" add 6f76878 PLC4X-3 - Implement a testing framework for protocols add 1eae1c9 Improved test-coverage new 9a09ef4 Merge remote-tracking branch 'origin/master' into feature/Beckhoff_ADS_protocol new 6635fa7 post merge junit 4 migration The 2 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: Jenkinsfile | 6 +- .../java/examples/dummydriver/DummyDriver.java | 12 +- .../dummydriver/connection/DummyConnection.java | 11 + .../examples/dummydriver/netty/DummyProtocol.java | 28 +- .../kafka-bridge/kafka-bridge.yml | 23 +- examples/{iotree => kafka-bridge}/pom.xml | 44 ++- .../kafka-bridge/server.sh | 17 +- .../java/examples/kafkabridge/KafkaBridge.java | 121 ++++++ .../java/examples/kafkabridge/model/Address.java | 39 +- .../examples/kafkabridge/model/Configuration.java | 56 +++ .../examples/kafkabridge/model/KafkaConfig.java | 28 +- .../java/examples/kafkabridge/model/PlcConfig.java | 27 +- .../kafka-bridge/src/main}/resources/logback.xml | 0 examples/plclogger/pom.xml | 4 + .../plc4x/java/examples/plclogger/PlcLogger.java | 74 +--- examples/pom.xml | 1 + .../java/org/apache/plc4x/camel/ConstantsTest.java | 8 +- .../org/apache/plc4x/camel/PLC4XComponentTest.java | 14 +- .../org/apache/plc4x/camel/PLC4XEndpointTest.java | 25 +- .../org/apache/plc4x/camel/PLC4XProducerTest.java | 20 +- integrations/apache-edgent/pom.xml | 7 + .../apache/plc4x/edgent/PlcConnectionAdapter.java | 4 + .../plc4x/edgent/PlcConnectionAdapterTest.java | 157 ++++---- .../org/apache/plc4x/edgent/PlcFunctionsTest.java | 11 +- .../apache/plc4x/edgent/mock/MockConnection.java | 11 +- plc4j/api/pom.xml | 6 + .../plc4x/java/api/connection/PlcConnection.java | 7 + .../PlcUsernamePasswordAuthenticationTest.java | 17 +- .../plc4x/java/api/connection/PlcReaderTest.java | 7 +- .../plc4x/java/api/connection/PlcWriterTest.java | 7 +- .../plc4x/java/api/messages/APIMessageTests.java | 193 +++++----- .../java/api/messages/PlcReadRequestTest.java | 32 +- .../java/api/messages/PlcReadResponseTest.java | 8 +- .../plc4x/java/api/messages/PlcRequestTest.java | 44 +-- .../plc4x/java/api/messages/PlcResponseTest.java | 50 +-- .../java/api/messages/PlcWriteRequestTest.java | 32 +- .../java/api/messages/PlcWriteResponseTest.java | 8 +- .../specific/TypeSafePlcReadRequestTest.java | 32 +- .../specific/TypeSafePlcReadResponseTest.java | 26 +- .../specific/TypeSafePlcWriteRequestTest.java | 30 +- .../specific/TypeSafePlcWriteResponseTest.java | 20 +- plc4j/core/pom.xml | 7 + .../apache/plc4x/java/PlcDriverManagerTest.java | 27 +- .../java/ads/connection/ADSPlcConnection.java | 8 + .../apache/plc4x/java/ads/ADSPlcDriverTest.java | 38 +- .../java/ads/api/commands/types/LengthTest.java | 28 +- .../ads/api/commands/types/ReadLengthTest.java | 30 +- .../ads/api/commands/types/SampleSizeTest.java | 29 +- .../java/ads/api/commands/types/SamplesTest.java | 28 +- .../ads/api/commands/types/WriteLengthTest.java | 29 +- .../java/ads/api/generic/types/AMSPortTest.java | 29 +- .../java/ads/api/generic/types/DataLengthTest.java | 28 +- .../java/ads/api/generic/types/LengthTest.java | 29 +- .../java/ads/connection/ADSPlcConnectionTests.java | 28 +- .../java/ads/util/ExtendWithTcpHexDumper.java | 42 --- .../plc4x/java/ads/util/Junit5Backport.java} | 26 +- .../apache/plc4x/java/ads/util/TcpHexDumper.java | 66 +--- plc4j/protocols/{s7 => driver-base}/pom.xml | 50 ++- .../base/connection/AbstractPlcConnection.java | 116 ++++++ .../java/base/connection/ChannelFactory.java} | 15 +- .../base/connection/TcpSocketChannelFactory.java | 63 ++++ .../java/base/connection/TestChannelFactory.java} | 13 +- plc4j/protocols/pom.xml | 1 + plc4j/protocols/s7/pom.xml | 24 ++ .../java/isotp/netty/model/types/TpduSize.java | 40 +- .../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 14 +- .../plc4x/java/s7/connection/S7PlcConnection.java | 179 ++++----- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 1 + .../org/apache/plc4x/java/s7/netty/S7Protocol.java | 2 +- .../s7/netty/model/types/HeaderErrorClass.java | 15 + .../java/s7/netty/model/types/ParameterError.java | 15 + .../java/isoontcp/netty/IsoOnTcpProtocolTest.java | 37 +- .../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 405 +++++++++++---------- .../java/isotp/netty/model/IsoTPMessageTests.java | 21 +- .../isotp/netty/model/params/ParameterTests.java | 36 +- .../netty/model/params/TsapParameterTests.java | 42 +-- .../isotp/netty/model/tpdus/IsotpModelTests.java | 113 +++--- .../isotp/netty/model/types/IsotpTypeTests.java | 166 ++++++--- .../plc4x/java/netty/events/S7StateTests.java | 21 +- .../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 45 ++- .../apache/plc4x/java/s7/S7PlcReaderSample.java | 99 +++-- .../java/s7/connection/S7PlcConnectionIT.java | 74 ++++ .../java/s7/connection/S7PlcConnectionTests.java | 79 ++-- .../java/s7/connection/S7PlcTestConnection.java | 189 ++++++++++ .../apache/plc4x/java/s7/model/S7AddressTests.java | 39 +- .../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 83 +++-- .../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 15 +- .../s7/netty/model/messages/S7MessageTests.java | 103 +++--- .../s7/netty/model/params/S7ParameterTests.java | 39 +- .../s7/netty/model/payloads/S7PayloadTests.java | 29 +- .../java/s7/netty/model/types/S7TypeTests.java | 119 +++--- .../s7/connection/iso-tp-connect-response.pcap | Bin 0 -> 116 bytes .../s7-setup-communication-response.pcap | Bin 0 -> 121 bytes plc4j/utils/pom.xml | 1 + plc4j/utils/raw-sockets/pom.xml | 6 - .../plc4x/java/utils/rawsockets/RawSocket.java | 28 +- .../utils/rawsockets/netty/RawSocketChannel.java | 34 +- ...ketAddress.java => RawSocketChannelConfig.java} | 15 +- ...ketAddress.java => RawSocketChannelOption.java} | 14 +- plc4j/{api => utils/test-utils}/pom.xml | 10 +- .../java/org/apache/plc4x/test/FastTests.java} | 4 +- .../test-utils}/src/main/resources/logback.xml | 2 +- pom.xml | 87 ++--- 103 files changed, 2535 insertions(+), 1707 deletions(-) copy integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver => examples/kafka-bridge/kafka-bridge.yml (58%) copy examples/{iotree => kafka-bridge}/pom.xml (64%) copy .mvn/wrapper/maven-wrapper.properties => examples/kafka-bridge/server.sh (56%) mode change 100644 => 100755 create mode 100644 examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadRequestItem.java => examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/Address.java (58%) create mode 100644 examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/Configuration.java copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java => examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/KafkaConfig.java (56%) copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/CustomTpdu.java => examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/PlcConfig.java (62%) copy {plc4j/protocols/s7/src/test => examples/kafka-bridge/src/main}/resources/logback.xml (100%) delete mode 100644 plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/util/ExtendWithTcpHexDumper.java copy plc4j/protocols/ads/src/{main/java/org/apache/plc4x/java/ads/api/util/ByteReadableUtils.java => test/java/org/apache/plc4x/java/ads/util/Junit5Backport.java} (63%) copy plc4j/protocols/{s7 => driver-base}/pom.xml (65%) create mode 100644 plc4j/protocols/driver-base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java copy plc4j/protocols/{s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java => driver-base/src/main/java/org/apache/plc4x/java/base/connection/ChannelFactory.java} (70%) create mode 100644 plc4j/protocols/driver-base/src/main/java/org/apache/plc4x/java/base/connection/TcpSocketChannelFactory.java copy plc4j/protocols/{s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesParameter.java => driver-base/src/test/java/org/apache/plc4x/java/base/connection/TestChannelFactory.java} (69%) create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionIT.java create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcTestConnection.java create mode 100644 plc4j/protocols/s7/src/test/resources/org/apache/plc4x/java/s7/connection/iso-tp-connect-response.pcap create mode 100644 plc4j/protocols/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-setup-communication-response.pcap copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/{RawSocketAddress.java => RawSocketChannelConfig.java} (69%) copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/{RawSocketAddress.java => RawSocketChannelOption.java} (74%) copy plc4j/{api => utils/test-utils}/pom.xml (80%) copy plc4j/{protocols/s7/src/test/java/org/apache/plc4x/java/netty/NettyTestBase.java => utils/test-utils/src/main/java/org/apache/plc4x/test/FastTests.java} (92%) copy {examples/plclogger => plc4j/utils/test-utils}/src/main/resources/logback.xml (97%) -- To stop receiving notification emails like this one, please contact sru...@apache.org.