This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch refactor/spi3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 66ba7f9050 chore: Updated the KNX and the BacNet vendor ids.
add ca01eb841e test: Added Integration Tests that test all 3 Modbus
variants with TCP, UDP and TLS transports.
No new revisions were added by this update.
Summary of changes:
plc4j/drivers/modbus/pom.xml | 49 +-
.../plc4x/java/modbus/readwrite/Constants.java | 6 +
.../java/modbus/ascii/ModbusAsciiConnection.java | 122 +--
.../plc4x/java/modbus/ascii/ModbusAsciiDriver.java | 39 +-
.../java/modbus/ascii/ModbusAsciiMessageCodec.java | 93 ++-
.../ModbusAsciiPskTlsTransportConfiguration.java} | 4 +-
.../ModbusAsciiSerialTransportConfiguration.java} | 9 +-
.../ModbusAsciiTcpTransportConfiguration.java} | 9 +-
.../ModbusAsciiTlsTransportConfiguration.java} | 4 +-
.../ModbusAsciiUdpTransportConfiguration.java} | 9 +-
.../plc4x/java/modbus/rtu/ModbusRtuConnection.java | 122 +--
.../plc4x/java/modbus/rtu/ModbusRtuDriver.java | 39 +-
.../ModbusRtuPskTlsTransportConfiguration.java} | 4 +-
.../ModbusRtuSerialTransportConfiguration.java} | 9 +-
.../ModbusRtuTcpTransportConfiguration.java} | 9 +-
.../ModbusRtuTlsTransportConfiguration.java} | 4 +-
.../ModbusRtuUdpTransportConfiguration.java} | 9 +-
.../plc4x/java/modbus/tcp/ModbusTcpDriver.java | 12 +-
...ava => ModbusTcpUdpTransportConfiguration.java} | 10 +-
.../java/modbus/ContainerArtifactsExtension.java | 94 +++
.../apache/plc4x/java/modbus/ModbusDockerIT.java | 928 +++++++++++++++++++++
.../modbus/ascii/ModbusAsciiConnectionTest.java | 38 -
.../modbus/ascii/ModbusAsciiMessageCodecTest.java | 15 +-
...dbusAsciiPskTlsTransportConfigurationTest.java} | 6 +-
...dbusAsciiSerialTransportConfigurationTest.java} | 14 +-
.../ModbusAsciiTcpTransportConfigurationTest.java} | 14 +-
.../ModbusAsciiTlsTransportConfigurationTest.java} | 6 +-
.../ModbusAsciiUdpTransportConfigurationTest.java} | 14 +-
.../java/modbus/rtu/ModbusRtuConnectionTest.java | 38 -
...ModbusRtuPskTlsTransportConfigurationTest.java} | 6 +-
...ModbusRtuSerialTransportConfigurationTest.java} | 14 +-
.../ModbusRtuTcpTransportConfigurationTest.java} | 16 +-
.../ModbusRtuTlsTransportConfigurationTest.java} | 6 +-
.../ModbusRtuUdpTransportConfigurationTest.java} | 16 +-
...=> ModbusTcpUdpTransportConfigurationTest.java} | 6 +-
.../modbus/src/test/resources/modbus/Dockerfile | 42 +
.../src/test/resources/modbus/modbus_server.py | 327 ++++++++
.../main/resources/protocols/modbus/modbus.mspec | 1 +
38 files changed, 1831 insertions(+), 332 deletions(-)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpPskTlsTransportConfiguration.java
=> ascii/config/ModbusAsciiPskTlsTransportConfiguration.java} (88%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiSerialTransportConfiguration.java}
(78%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiTcpTransportConfiguration.java}
(79%)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpTlsTransportConfiguration.java
=> ascii/config/ModbusAsciiTlsTransportConfiguration.java} (88%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiUdpTransportConfiguration.java}
(79%)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpPskTlsTransportConfiguration.java
=> rtu/config/ModbusRtuPskTlsTransportConfiguration.java} (90%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuSerialTransportConfiguration.java}
(78%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuTcpTransportConfiguration.java}
(79%)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpTlsTransportConfiguration.java
=> rtu/config/ModbusRtuTlsTransportConfiguration.java} (90%)
copy
plc4j/{spi/config/src/main/java/org/apache/plc4x/java/spi/config/annotations/ComplexConfigurationParameterDefaultOverride.java
=>
drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuUdpTransportConfiguration.java}
(79%)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/config/{ModbusTcpTlsTransportConfiguration.java
=> ModbusTcpUdpTransportConfiguration.java} (77%)
create mode 100644
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ContainerArtifactsExtension.java
create mode 100644
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusDockerIT.java
copy
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpPskTlsTransportConfigurationTest.java
=> ascii/config/ModbusAsciiPskTlsTransportConfigurationTest.java} (84%)
copy
plc4j/{api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTagRangeExceptionTest.java
=>
drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiSerialTransportConfigurationTest.java}
(73%)
copy
plc4j/{api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTagRangeExceptionTest.java
=>
drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiTcpTransportConfigurationTest.java}
(73%)
copy
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpTlsTransportConfigurationTest.java
=> ascii/config/ModbusAsciiTlsTransportConfigurationTest.java} (84%)
copy
plc4j/{api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTagRangeExceptionTest.java
=>
drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ascii/config/ModbusAsciiUdpTransportConfigurationTest.java}
(73%)
copy
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpPskTlsTransportConfigurationTest.java
=> rtu/config/ModbusRtuPskTlsTransportConfigurationTest.java} (84%)
copy
plc4j/{api/src/test/java/org/apache/plc4x/java/api/exceptions/PlcTagRangeExceptionTest.java
=>
drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuSerialTransportConfigurationTest.java}
(73%)
copy
plc4j/drivers/{ads/src/test/java/org/apache/plc4x/java/ads/tag/SymbolicAdsTagTest.java
=>
modbus/src/test/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuTcpTransportConfigurationTest.java}
(74%)
copy
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/{tcp/config/ModbusTcpTlsTransportConfigurationTest.java
=> rtu/config/ModbusRtuTlsTransportConfigurationTest.java} (85%)
copy
plc4j/drivers/{ads/src/test/java/org/apache/plc4x/java/ads/tag/SymbolicAdsTagTest.java
=>
modbus/src/test/java/org/apache/plc4x/java/modbus/rtu/config/ModbusRtuUdpTransportConfigurationTest.java}
(74%)
copy
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/tcp/config/{ModbusTcpTcpTransportConfigurationTest.java
=> ModbusTcpUdpTransportConfigurationTest.java} (83%)
create mode 100644 plc4j/drivers/modbus/src/test/resources/modbus/Dockerfile
create mode 100644
plc4j/drivers/modbus/src/test/resources/modbus/modbus_server.py
