This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a change to branch refactor/spi3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from e526655718 refactor: Refactored the code of the not finished ctrlx
driver to the new SPI.
add 394b31fd7f refactor: Refactored most of the unfinished protocols to a
state that matches the previous state. Also improved the test coverage of
already ported drivers to fulfill the requirements.
No new revisions were added by this update.
Summary of changes:
plc4j/drivers/ab-eth/pom.xml | 36 +
.../configuration/AbEthConfigurationTest.java} | 22 +-
.../AbEthTcpTransportConfigurationTest.java} | 14 +-
.../plc4x/java/abeth/tag/AbEthTagHandlerTest.java} | 32 +-
.../apache/plc4x/java/abeth/tag/AbEthTagTest.java | 102 +
.../plc4x/java/abeth/types/FileTypeTest.java | 62 +
plc4j/drivers/bacnet/pom.xml | 54 +-
.../java/bacnetip/readwrite/BACnetVendorId.java | 8 +
.../plc4x/java/bacnetip/BacNetIpConnection.java | 306 +
.../apache/plc4x/java/bacnetip/BacNetIpDriver.java | 85 +-
.../plc4x/java/bacnetip/BacNetIpMessageCodec.java} | 40 +-
.../java/bacnetip/BacNetIpSubscriptionHandle.java} | 23 +-
.../configuration/BacNetIpConfiguration.java | 10 +-
.../BacNetPcapReplayTransportConfiguration.java | 75 -
.../BacNetRawSocketTransportConfiguration.java | 75 -
.../BacNetUdpTransportConfiguration.java | 5 +-
.../bacnetip/protocol/BacNetIpProtocolLogic.java | 291 -
.../bacnetip/readwrite/utils/StaticHelper.java | 101 +-
.../java/bacnetip/tag/BacNetIpTagHandler.java | 6 +-
.../java/bacnetip/BACnetParserSerializerTest.java | 29 -
.../BACnetParserSerializerTestSuiteGenerator.java | 49 -
.../plc4x/java/bacnetip/ManualBacNetDecoder.java | 48 -
.../bacnetip/PassiveBacNetIpDriver2Manual.java | 52 -
.../bacnetip/PassiveBacNetIpDriver3Manual.java | 55 -
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 42 -
.../plc4x/java/bacnetip/RandomPackagesTest.java | 6205 --------------------
.../plc4x/java/bacnetip/TrickyPackagesTest.java | 238 -
.../java/org/apache/plc4x/java/bacnetip/Utils.java | 70 -
plc4j/drivers/c-bus/pom.xml | 38 +
.../apache/plc4x/java/cbus/CBusMessageCodec.java | 12 +
.../java/cbus/readwrite/utils/StaticHelper.java | 29 +-
.../apache/plc4x/java/cbus/RandomPackagesTest.java | 78 +-
.../org/apache/plc4x/java/cbus/ReferenceTest.java | 333 +-
.../test/java/org/apache/plc4x/java/cbus/Util.java | 3 +-
.../cbus/configuration/CBusConfigurationTest.java} | 24 +-
plc4j/drivers/can/pom.xml | 40 +
.../java/can/generic/transport/GenericFrame.java | 4 +-
.../GenericCANConfigurationTest.java} | 17 +-
.../java/can/generic/tag/GenericCANTagTest.java | 88 +
.../can/generic/transport/GenericFrameTest.java | 81 +
plc4j/drivers/canopen/pom.xml | 44 +
.../plc4x/java/canopen/readwrite/CANOpenFrame.java | 20 +-
.../canopen/readwrite/CANOpenHeartbeatPayload.java | 9 +-
.../plc4x/java/canopen/readwrite/CANOpenMPDO.java | 17 +-
.../canopen/readwrite/CANOpenNetworkPayload.java | 13 +-
.../plc4x/java/canopen/readwrite/CANOpenPDO.java | 9 +-
.../java/canopen/readwrite/CANOpenPDOPayload.java | 9 +-
.../java/canopen/readwrite/CANOpenPayload.java | 5 +-
.../java/canopen/readwrite/CANOpenSDORequest.java | 13 +-
.../java/canopen/readwrite/CANOpenSDOResponse.java | 13 +-
.../plc4x/java/canopen/readwrite/CANOpenTime.java | 15 +-
.../readwrite/CANOpenTimeSynchronization.java | 9 +-
.../plc4x/java/canopen/readwrite/DataItem.java | 97 +-
.../plc4x/java/canopen/readwrite/IndexAddress.java | 13 +-
.../plc4x/java/canopen/readwrite/SDOAbort.java | 13 +-
.../java/canopen/readwrite/SDOAbortRequest.java | 9 +-
.../java/canopen/readwrite/SDOAbortResponse.java | 9 +-
.../plc4x/java/canopen/readwrite/SDOBlockData.java | 13 +-
.../java/canopen/readwrite/SDOBlockRequest.java | 9 +-
.../java/canopen/readwrite/SDOBlockResponse.java | 9 +-
.../readwrite/SDOInitiateDownloadRequest.java | 25 +-
.../readwrite/SDOInitiateDownloadResponse.java | 9 +-
.../SDOInitiateExpeditedUploadResponse.java | 9 +-
.../SDOInitiateSegmentedReservedResponse.java | 5 +-
.../SDOInitiateSegmentedUploadResponse.java | 9 +-
.../readwrite/SDOInitiateUploadRequest.java | 9 +-
.../readwrite/SDOInitiateUploadResponse.java | 25 +-
.../SDOInitiateUploadResponsePayload.java | 5 +-
.../plc4x/java/canopen/readwrite/SDORequest.java | 5 +-
.../plc4x/java/canopen/readwrite/SDOResponse.java | 5 +-
.../plc4x/java/canopen/readwrite/SDOSegment.java | 25 +-
.../readwrite/SDOSegmentDownloadRequest.java | 21 +-
.../readwrite/SDOSegmentDownloadResponse.java | 9 +-
.../canopen/readwrite/SDOSegmentUploadRequest.java | 9 +-
.../readwrite/SDOSegmentUploadResponse.java | 21 +-
.../java/canopen/CANOpenSmallSurfaceTest.java | 144 +
plc4j/drivers/ctrlx/pom.xml | 43 +
.../plc4x/java/ctrlx/readwrite/CtrlXUnitsTest.java | 78 +
plc4j/drivers/eip/pom.xml | 79 +-
.../java/eip/base/tag/EipTagCoverageTest.java | 141 +
.../{EipTagTest.java => EipTagHandlerTest.java} | 24 +-
plc4j/drivers/open-protocol/pom.xml | 88 +-
.../java/openprotocol/OpenProtocolConnection.java} | 59 +-
.../java/openprotocol/OpenProtocolDriver.java | 79 +-
.../openprotocol/OpenProtocolMessageCodec.java | 89 +
.../config/OpenProtocolConfiguration.java | 23 +-
.../OpenProtocolTcpTransportConfiguration.java | 4 +-
.../protocol/OpenProtocolProtocolLogic.java | 83 -
.../openprotocol/tag/OpenProtocolTagHandler.java | 2 +-
.../openprotocol/readwrite/utils/StaticHelper.java | 29 -
.../OpenProtocolParserSerializerTest.java | 2 +-
.../plc4x/java/openprotocol/SmallSurfaceTest.java | 88 +
plc4j/drivers/profinet-ng/pom.xml | 108 +-
.../plc4x/java/profinet/ProfinetConnection.java | 865 +++
.../apache/plc4x/java/profinet/ProfinetDriver.java | 262 +-
.../plc4x/java/profinet/ProfinetMessageCodec.java | 64 +
.../java/profinet/channel/ProfinetChannel.java | 12 +-
.../profinet/config/ProfinetConfiguration.java | 10 +-
.../ProfinetRawSocketTransportConfiguration.java | 37 +-
.../profinet/context/ProfinetDriverContext.java | 24 +-
.../profinet/discovery/ProfinetDiscoverer.java | 19 +-
.../java/profinet/packets/PnDcpPacketFactory.java | 522 +-
.../profinet/packets/ProfinetConversation.java | 55 +
.../profinet/protocol/ProfinetProtocolLogic.java | 908 ---
.../profinet/readwrite/utils/StaticHelper.java | 58 +-
.../java/profinet/tag/ProfinetTagHandler.java | 2 +-
.../plc4x/java/profinet/tag/ProfinetTagTest.java | 74 +
plc4j/drivers/profinet/pom.xml | 114 +-
.../plc4x/java/profinet/ProfinetConnection.java | 289 +
.../apache/plc4x/java/profinet/ProfinetDriver.java | 101 +-
.../profinet/config/ProfinetConfiguration.java | 10 +-
.../ProfinetRawSocketTransportConfiguration.java | 17 +-
.../profinet/context/ProfinetDeviceContext.java | 40 +-
.../profinet/context/ProfinetDriverContext.java | 9 +-
.../java/profinet/device/ProfinetChannel.java | 12 +-
.../plc4x/java/profinet/device/ProfinetDevice.java | 65 +-
.../java/profinet/device/ProfinetEmptyModule.java | 8 +-
.../plc4x/java/profinet/device/ProfinetModule.java | 8 +-
.../java/profinet/device/ProfinetModuleImpl.java | 26 +-
.../device/ProfinetSubscriptionHandle.java | 27 +-
.../profinet/discovery/ProfinetPlcDiscoverer.java | 28 +-
.../profinet/protocol/ProfinetProtocolLogic.java | 274 -
.../profinet/readwrite/utils/StaticHelper.java | 59 +-
.../java/profinet/tag/ProfinetTagHandler.java | 2 +-
.../plc4x/java/profinet/DummyMessageWrapper.java | 36 -
.../plc4x/java/profinet/DummyNetworkInterface.java | 63 -
.../java/profinet/ManualProfinetIoAdamTest.java | 73 -
.../profinet/ManualProfinetIoDiscoveryTest.java | 34 -
.../profinet/ManualProfinetIoSimocodeTest.java | 76 -
.../java/profinet/ManualProfinetPcapTest.java | 120 -
.../plc4x/java/profinet/ProfinetBrowseTests.java | 128 -
.../plc4x/java/profinet/ProfinetCheckSumTests.java | 108 -
.../java/profinet/ProfinetDeviceContextTests.java | 172 -
.../profinet/ProfinetParserSerializerTest.java | 31 -
...ProfinetParserSerializerTestSuiteGenerator.java | 33 -
.../java/profinet/ProfinetSubscriptionTests.java | 28 -
.../profinet/gsdml/ProfinetConfigurationTests.java | 362 --
.../rawsocket/RawSocketTransportInstance.java | 55 +-
.../config/RawSocketTransportConfiguration.java | 13 +
pom.xml | 5 +
.../protocols/bacnetip/bacnet-vendorids.mspec | 4 +
141 files changed, 4530 insertions(+), 11396 deletions(-)
copy
plc4j/drivers/ab-eth/src/{main/java/org/apache/plc4x/java/abeth/configuration/AbEthTcpTransportConfiguration.java
=>
test/java/org/apache/plc4x/java/abeth/configuration/AbEthConfigurationTest.java}
(58%)
copy
plc4j/drivers/ab-eth/src/{main/java/org/apache/plc4x/java/abeth/configuration/AbEthTcpTransportConfiguration.java
=>
test/java/org/apache/plc4x/java/abeth/configuration/AbEthTcpTransportConfigurationTest.java}
(74%)
copy
plc4j/drivers/ab-eth/src/{main/java/org/apache/plc4x/java/abeth/tag/AbEthTagHandler.java
=> test/java/org/apache/plc4x/java/abeth/tag/AbEthTagHandlerTest.java} (56%)
create mode 100644
plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/java/abeth/tag/AbEthTagTest.java
create mode 100644
plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/java/abeth/types/FileTypeTest.java
create mode 100644
plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpConnection.java
copy
plc4j/drivers/{plc4x/src/main/java/org/apache/plc4x/java/plc4x/Plc4xMessageCodec.java
=>
bacnet/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpMessageCodec.java}
(56%)
copy
plc4j/drivers/{simulated/src/main/java/org/apache/plc4x/java/simulated/connection/SimulatedSubscriptionHandle.java
=>
bacnet/src/main/java/org/apache/plc4x/java/bacnetip/BacNetIpSubscriptionHandle.java}
(67%)
delete mode 100644
plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetPcapReplayTransportConfiguration.java
delete mode 100644
plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/configuration/BacNetRawSocketTransportConfiguration.java
delete mode 100644
plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocolLogic.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTest.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver2Manual.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver3Manual.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/TrickyPackagesTest.java
delete mode 100644
plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/Utils.java
copy
plc4j/drivers/c-bus/src/{main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java
=>
test/java/org/apache/plc4x/java/cbus/configuration/CBusConfigurationTest.java}
(57%)
copy
plc4j/drivers/{firmata/src/test/java/org/apache/plc4x/java/firmata/configuration/FirmataConfigurationTest.java
=>
can/src/test/java/org/apache/plc4x/java/can/generic/configuration/GenericCANConfigurationTest.java}
(66%)
create mode 100644
plc4j/drivers/can/src/test/java/org/apache/plc4x/java/can/generic/tag/GenericCANTagTest.java
create mode 100644
plc4j/drivers/can/src/test/java/org/apache/plc4x/java/can/generic/transport/GenericFrameTest.java
create mode 100644
plc4j/drivers/canopen/src/test/java/org/apache/plc4x/java/canopen/CANOpenSmallSurfaceTest.java
create mode 100644
plc4j/drivers/ctrlx/src/test/java/org/apache/plc4x/java/ctrlx/readwrite/CtrlXUnitsTest.java
create mode 100644
plc4j/drivers/eip/src/test/java/org/apache/plc4x/java/eip/base/tag/EipTagCoverageTest.java
copy
plc4j/drivers/eip/src/test/java/org/apache/plc4x/java/eip/base/tag/{EipTagTest.java
=> EipTagHandlerTest.java} (64%)
copy
plc4j/drivers/{c-bus/src/main/java/org/apache/plc4x/java/cbus/CBusConnection.java
=>
open-protocol/src/main/java/org/apache/plc4x/java/openprotocol/OpenProtocolConnection.java}
(55%)
create mode 100644
plc4j/drivers/open-protocol/src/main/java/org/apache/plc4x/java/openprotocol/OpenProtocolMessageCodec.java
delete mode 100644
plc4j/drivers/open-protocol/src/main/java/org/apache/plc4x/java/openprotocol/protocol/OpenProtocolProtocolLogic.java
delete mode 100644
plc4j/drivers/open-protocol/src/main/temp/org/apache/plc4x/java/openprotocol/readwrite/utils/StaticHelper.java
create mode 100644
plc4j/drivers/open-protocol/src/test/java/org/apache/plc4x/java/openprotocol/SmallSurfaceTest.java
create mode 100644
plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetConnection.java
create mode 100644
plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/ProfinetMessageCodec.java
create mode 100644
plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/packets/ProfinetConversation.java
delete mode 100644
plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java
create mode 100644
plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/tag/ProfinetTagTest.java
create mode 100644
plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/ProfinetConnection.java
delete mode 100644
plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/protocol/ProfinetProtocolLogic.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/DummyMessageWrapper.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/DummyNetworkInterface.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoAdamTest.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoDiscoveryTest.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoSimocodeTest.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetPcapTest.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetBrowseTests.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetCheckSumTests.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetDeviceContextTests.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetParserSerializerTest.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetParserSerializerTestSuiteGenerator.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/ProfinetSubscriptionTests.java
delete mode 100644
plc4j/drivers/profinet/src/test/java/org/apache/plc4x/java/profinet/gsdml/ProfinetConfigurationTests.java
