This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 2e7ccc1 - Added a missing license header.
new 1ac09c9 added execute() to PlcRequest
new edc56be implemented new api in driver base
new b455ade implemented new api for ads protocol
new 7bde898 implemented new api for ethernet/ip protocol
new 996b74e implemented new api for modbus protocol
new c66b83e implemented new api for s7 and test protocols
new 361432c fixed integrations to use the new api
new 7375d04 fixed examples to use the new api
new 8da0bc2 removed default methods from the api
new e60f924 moved Request Builder factories to PlcConnection
new eb079f9 adjusted connectors and examples to the new api
new ec66346 moved driver to spi package
new d36e382 renamed message builder to request builder
new 554c303 moved reader,writer,subscriber to driver-base module
new 08437d2 fixed documentation
new 827b7a1 moved proprietary types to driver-base
new ccddc20 removed type parameter from request builder
new 48dbad0 allow multiple connections in kafka connector
new 0062260 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/execute-operation
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:
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 9 +-
.../java/examples/dummydriver/DummyDriver.java | 4 +-
.../dummydriver/connection/DummyConnection.java | 40 ++++---
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 9 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 26 ++---
.../java/examples/kafkabridge/KafkaBridge.java | 4 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 4 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 27 ++---
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 17 +--
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 13 +--
.../java/org/apache/plc4x/camel/MockDriver.java | 16 +--
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 1 +
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 10 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 28 ++---
.../java/org/apache/plc4x/edgent/PlcFunctions.java | 2 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 4 +-
.../apache/plc4x/edgent/mock/MockConnection.java | 21 ++--
.../org/apache/plc4x/edgent/mock/MockDriver.java | 4 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
integrations/apache-kafka/config/source.properties | 3 +-
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 13 +--
.../apache/plc4x/kafka/Plc4xSourceConnector.java | 45 ++++----
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 59 ++++++----
.../org/apache/plc4x/nifi/BasePlc4xProcessor.java | 2 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 12 +-
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 26 +++--
.../java/api/{connection => }/PlcConnection.java | 14 ++-
.../java/api/connection/PlcProprietarySender.java | 29 -----
.../plc4x/java/api/connection/PlcSubscriber.java | 128 ---------------------
.../plc4x/java/api/messages/PlcFieldRequest.java | 4 +
.../plc4x/java/api/messages/PlcFieldResponse.java | 6 +-
.../java/api/messages/PlcProprietaryResponse.java | 23 ----
.../plc4x/java/api/messages/PlcReadRequest.java | 12 +-
.../plc4x/java/api/messages/PlcReadResponse.java | 5 +-
.../apache/plc4x/java/api/messages/PlcRequest.java | 4 +-
...cMessageBuilder.java => PlcRequestBuilder.java} | 6 +-
.../plc4x/java/api/messages/PlcResponse.java | 7 +-
.../java/api/messages/PlcSubscriptionRequest.java | 10 +-
.../java/api/messages/PlcSubscriptionResponse.java | 5 +-
.../api/messages/PlcUnsubscriptionRequest.java | 10 +-
.../api/messages/PlcUnsubscriptionResponse.java | 14 +--
.../plc4x/java/api/messages/PlcWriteRequest.java | 9 +-
.../plc4x/java/api/messages/PlcWriteResponse.java | 5 +-
.../apache/plc4x/java/{api => spi}/PlcDriver.java | 6 +-
.../org/apache/plc4x/java/PlcDriverManager.java | 4 +-
.../apache/plc4x/java/mock/DoubleMockDriver.java | 4 +-
.../org/apache/plc4x/java/mock/MockConnection.java | 26 +++++
.../org/apache/plc4x/java/mock/MockDriver.java | 4 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../org/apache/plc4x/java/ads/AdsPlcDriver.java | 4 +-
.../ads/connection/AdsAbstractPlcConnection.java | 45 +++++---
.../ads/connection/AdsSerialPlcConnection.java | 5 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 33 +++---
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 2 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 30 ++---
.../apache/plc4x/java/ads/adslib/AmsRequest.java | 2 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 16 +--
.../connection/AdsAbstractPlcConnectionTest.java | 6 +-
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 4 +-
.../base/connection/AbstractPlcConnection.java | 30 +----
.../messages/DefaultPlcProprietaryRequest.java | 9 ++
.../messages/DefaultPlcProprietaryResponse.java | 6 +-
.../java/base/messages/DefaultPlcReadRequest.java | 21 +++-
.../messages/DefaultPlcSubscriptionRequest.java | 19 ++-
.../messages/DefaultPlcUnsubscriptionRequest.java | 18 ++-
.../java/base/messages/DefaultPlcWriteRequest.java | 17 ++-
.../base/messages/InternalPlcFieldResponse.java | 2 +-
.../messages/InternalPlcProprietaryRequest.java | 2 -
.../messages/InternalPlcProprietaryResponse.java | 4 +-
.../base/messages/InternalPlcReadResponse.java | 2 +-
.../java/base/messages/InternalPlcResponse.java | 3 +-
.../base/messages/InternalPlcWriteResponse.java | 2 +-
.../java/base}/messages/PlcProprietaryRequest.java | 4 +-
...lcResponse.java => PlcProprietaryResponse.java} | 3 +-
...etaryRequest.java => PlcProprietarySender.java} | 5 +-
.../java/base}/messages/PlcProtocolMessage.java | 2 +-
.../plc4x/java/base/messages/PlcRawMessage.java | 1 -
.../plc4x/java/base/messages}/PlcReader.java | 18 +--
.../java/base/messages/PlcRequestContainer.java | 2 -
.../plc4x/java/base/messages/PlcSubscriber.java | 65 +++++++++++
.../plc4x/java/base/messages}/PlcWriter.java | 18 +--
.../SingleItemToSingleRequestProtocol.java | 65 ++++++-----
.../base/messages/PlcRequestContainerTest.java | 1 -
.../SingleItemToSingleRequestProtocolTest.java | 60 ++++++----
.../plc4x/java/base/connection/MockConnection.java | 26 ++++-
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 4 +-
.../connection/BaseEtherNetIpPlcConnection.java | 28 +++--
.../connection/EtherNetIpTcpPlcConnection.java | 13 +++
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 12 +-
.../apache/plc4x/java/modbus/ModbusPlcDriver.java | 4 +-
.../modbus/connection/BaseModbusPlcConnection.java | 38 +++---
.../modbus/connection/ModbusTcpPlcConnection.java | 5 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 35 +++---
.../connection/BaseModbusPlcConnectionTest.java | 4 +-
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +-
.../java/isotp/netty/model/tpdus/DataTpdu.java | 2 +-
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 2 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 38 +++---
.../java/s7/netty/model/messages/S7Message.java | 2 +-
.../s7/netty/model/messages/S7RequestMessage.java | 2 +-
.../messages/SetupCommunicationRequestMessage.java | 2 +-
.../strategies/DefaultS7MessageProcessor.java | 2 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 7 --
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 8 --
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 6 -
.../apache/plc4x/java/s7/issues/PLC4X47Test.java | 4 +-
.../asciidoc/developers/implementing-drivers.adoc | 4 +-
.../org/apache/plc4x/java/test/TestConnection.java | 37 +++---
.../org/apache/plc4x/java/test/TestPlcDriver.java | 4 +-
...cDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
120 files changed, 803 insertions(+), 764 deletions(-)
rename
examples/dummy-driver/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
integrations/apache-camel/src/test/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
integrations/apache-edgent/src/test/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/api/{connection =>
}/PlcConnection.java (76%)
delete mode 100644
plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
delete mode 100644
plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
delete mode 100644
plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
rename
plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/{PlcMessageBuilder.java
=> PlcRequestBuilder.java} (92%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{api =>
spi}/PlcDriver.java (94%)
rename
plc4j/core/src/test/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
plc4j/core/src/test/resources/test/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
plc4j/protocols/ads/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/api =>
protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base}/messages/PlcProprietaryRequest.java
(89%)
copy
plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/{InternalPlcResponse.java
=> PlcProprietaryResponse.java} (88%)
copy
plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/{InternalPlcProprietaryRequest.java
=> PlcProprietarySender.java} (81%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/api =>
protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base}/messages/PlcProtocolMessage.java
(94%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/api/connection =>
protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages}/PlcReader.java
(65%)
create mode 100644
plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
rename plc4j/{api/src/main/java/org/apache/plc4x/java/api/connection =>
protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages}/PlcWriter.java
(64%)
rename
plc4j/protocols/ethernetip/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
plc4j/protocols/modbus/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
plc4j/protocols/s7/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
rename
plc4j/protocols/test/src/main/resources/META-INF/services/{org.apache.plc4x.java.api.PlcDriver
=> org.apache.plc4x.java.spi.PlcDriver} (100%)
