You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/10/17 16:48:07 UTC
[incubator-plc4x] branch master updated (2e7ccc1 -> 0062260)
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%)
[incubator-plc4x] 13/19: renamed message builder to request builder
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d36e382620f380875d8bf92e2e365ab44df23c68
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 16:08:27 2018 +0200
renamed message builder to request builder
---
.../org/apache/plc4x/java/api/messages/PlcReadRequest.java | 2 +-
.../{PlcMessageBuilder.java => PlcRequestBuilder.java} | 2 +-
.../plc4x/java/api/messages/PlcSubscriptionRequest.java | 2 +-
.../plc4x/java/api/messages/PlcUnsubscriptionRequest.java | 2 +-
.../plc4x/java/api/messages/PlcUnsubscriptionResponse.java | 11 -----------
.../org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 2 +-
.../src/main/java/org/apache/plc4x/java/spi/PlcDriver.java | 2 +-
7 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
index 62f97ba..6f9376e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
@@ -28,7 +28,7 @@ public interface PlcReadRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcReadResponse> execute();
- interface Builder extends PlcMessageBuilder<PlcReadRequest> {
+ interface Builder extends PlcRequestBuilder<PlcReadRequest> {
Builder addItem(String name, String fieldQuery);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessageBuilder.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
similarity index 93%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessageBuilder.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
index fd2d20e..98ff6af 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcMessageBuilder.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcMessageBuilder<T> {
+public interface PlcRequestBuilder<T extends PlcRequest> {
T build();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
index 917f3da..5eeac08 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
@@ -26,7 +26,7 @@ public interface PlcSubscriptionRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcSubscriptionResponse> execute();
- interface Builder extends PlcMessageBuilder<PlcSubscriptionRequest> {
+ interface Builder extends PlcRequestBuilder<PlcSubscriptionRequest> {
/**
* Adds a new field to the to be constructed request which should be polled cyclically.
*
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
index 995675f..7eebec9 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
@@ -28,7 +28,7 @@ public interface PlcUnsubscriptionRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcUnsubscriptionResponse> execute();
- interface Builder extends PlcMessageBuilder<PlcUnsubscriptionRequest> {
+ interface Builder extends PlcRequestBuilder<PlcUnsubscriptionRequest> {
/**
* TODO document me:
*
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
index 94b9174..4205e8b 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
@@ -23,15 +23,4 @@ public interface PlcUnsubscriptionResponse extends PlcFieldResponse {
@Override
PlcUnsubscriptionRequest getRequest();
- interface Builder extends PlcMessageBuilder<PlcUnsubscriptionResponse> {
- /**
- * Adds a new field to the to be constructed request which should cancel a previously
- * created subscription.
- *
- * @param name alias of the field.
- * @return builder.
- */
- PlcReadRequest.Builder addField(String name);
- }
-
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index 36c430e..ea8a767 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -32,7 +32,7 @@ public interface PlcWriteRequest extends PlcFieldRequest {
int getNumberOfValues(String name);
- interface Builder extends PlcMessageBuilder<PlcWriteRequest> {
+ interface Builder extends PlcRequestBuilder<PlcWriteRequest> {
PlcWriteRequest.Builder addItem(String name, String fieldQuery, Boolean... values);
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
index bc6b974..fae9c88 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
@@ -18,8 +18,8 @@ under the License.
*/
package org.apache.plc4x.java.spi;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
/**
[incubator-plc4x] 02/19: implemented new api in driver base
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit edc56be4efffde229e524be60d548505e48264bf
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:09:02 2018 +0200
implemented new api in driver base
---
.../messages/DefaultPlcProprietaryRequest.java | 9 +++
.../messages/DefaultPlcProprietaryResponse.java | 6 +-
.../java/base/messages/DefaultPlcReadRequest.java | 22 +++++++-
.../messages/DefaultPlcSubscriptionRequest.java | 20 ++++++-
.../messages/DefaultPlcUnsubscriptionRequest.java | 19 ++++++-
.../java/base/messages/DefaultPlcWriteRequest.java | 18 +++++-
.../base/messages/InternalPlcFieldResponse.java | 2 +-
.../messages/InternalPlcProprietaryResponse.java | 2 +-
.../base/messages/InternalPlcReadResponse.java | 2 +-
.../java/base/messages/InternalPlcResponse.java | 3 +-
.../base/messages/InternalPlcWriteResponse.java | 2 +-
.../SingleItemToSingleRequestProtocol.java | 65 ++++++++++++----------
.../SingleItemToSingleRequestProtocolTest.java | 60 ++++++++++++--------
13 files changed, 160 insertions(+), 70 deletions(-)
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
index fa716f0..4e73899 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryRequest.java
@@ -18,8 +18,17 @@
*/
package org.apache.plc4x.java.base.messages;
+import org.apache.plc4x.java.api.messages.PlcResponse;
+
+import java.util.concurrent.CompletableFuture;
+
public class DefaultPlcProprietaryRequest<REQUEST> implements InternalPlcProprietaryRequest<REQUEST> {
+ @Override
+ public CompletableFuture<PlcResponse> execute() {
+ throw new RuntimeException("not supported"); // TODO: figure out what to do with this
+ }
+
private REQUEST proprietaryRequest;
public DefaultPlcProprietaryRequest(REQUEST proprietaryRequest) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
index 679fde1..69ee2d0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcProprietaryResponse.java
@@ -18,13 +18,13 @@
*/
package org.apache.plc4x.java.base.messages;
-public class DefaultPlcProprietaryResponse<REQUEST, RESPONSE> implements InternalPlcProprietaryResponse<REQUEST, RESPONSE> {
+public class DefaultPlcProprietaryResponse<RESPONSE> implements InternalPlcProprietaryResponse<RESPONSE> {
- private final InternalPlcProprietaryRequest<REQUEST> plcProprietaryRequest;
+ private final InternalPlcProprietaryRequest plcProprietaryRequest;
private final RESPONSE proprietaryResponse;
- public DefaultPlcProprietaryResponse(InternalPlcProprietaryRequest<REQUEST> plcProprietaryRequest, RESPONSE proprietaryResponse) {
+ public DefaultPlcProprietaryResponse(InternalPlcProprietaryRequest plcProprietaryRequest, RESPONSE proprietaryResponse) {
this.plcProprietaryRequest = plcProprietaryRequest;
this.proprietaryResponse = proprietaryResponse;
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
index 9b60fe4..d835bc0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
@@ -19,23 +19,33 @@ under the License.
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.base.connection.PlcFieldHandler;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
public class DefaultPlcReadRequest implements InternalPlcReadRequest, InternalPlcFieldRequest {
+ private final PlcReader reader;
private LinkedHashMap<String, PlcField> fields;
- protected DefaultPlcReadRequest(LinkedHashMap<String, PlcField> fields) {
+ protected DefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
+ this.reader = reader;
this.fields = fields;
}
@Override
+ public CompletableFuture<PlcReadResponse> execute() {
+ return reader.read(this);
+ }
+
+ @Override
public int getNumberOfFields() {
return fields.size();
}
@@ -64,12 +74,18 @@ public class DefaultPlcReadRequest implements InternalPlcReadRequest, InternalPl
.collect(Collectors.toCollection(LinkedList::new));
}
+ protected PlcReader getReader() {
+ return reader;
+ }
+
public static class Builder implements PlcReadRequest.Builder {
+ private final PlcReader reader;
private final PlcFieldHandler fieldHandler;
private final Map<String, String> fields;
- public Builder(PlcFieldHandler fieldHandler) {
+ public Builder(PlcReader reader, PlcFieldHandler fieldHandler) {
+ this.reader = reader;
this.fieldHandler = fieldHandler;
fields = new TreeMap<>();
}
@@ -90,7 +106,7 @@ public class DefaultPlcReadRequest implements InternalPlcReadRequest, InternalPl
PlcField parsedField = fieldHandler.createField(fieldQuery);
parsedFields.put(name, parsedField);
});
- return new DefaultPlcReadRequest(parsedFields);
+ return new DefaultPlcReadRequest(reader, parsedFields);
}
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
index 3194cf5..35bf369 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
@@ -20,7 +20,9 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcSubscriptionType;
import org.apache.plc4x.java.base.connection.PlcFieldHandler;
@@ -28,11 +30,23 @@ import org.apache.plc4x.java.base.messages.items.FieldItem;
import java.time.Duration;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
// TODO: request broken needs finishing.
public class DefaultPlcSubscriptionRequest implements InternalPlcSubscriptionRequest, InternalPlcFieldRequest {
+ private final PlcSubscriber subscriber;
+
+ public DefaultPlcSubscriptionRequest(PlcSubscriber subscriber) {
+ this.subscriber = subscriber;
+ }
+
+ @Override
+ public CompletableFuture<PlcSubscriptionResponse> execute() {
+ return subscriber.subscribe(this);
+ }
+
@Override
public int getNumberOfFields() {
throw new IllegalStateException("not available");
@@ -65,10 +79,12 @@ public class DefaultPlcSubscriptionRequest implements InternalPlcSubscriptionReq
public static class Builder implements PlcSubscriptionRequest.Builder {
+ private final PlcSubscriber subscriber;
private final PlcFieldHandler fieldHandler;
private final Map<String, BuilderItem<Object>> fields;
- public Builder(PlcFieldHandler fieldHandler) {
+ public Builder(PlcSubscriber subscriber, PlcFieldHandler fieldHandler) {
+ this.subscriber = subscriber;
this.fieldHandler = fieldHandler;
fields = new TreeMap<>();
}
@@ -99,7 +115,7 @@ public class DefaultPlcSubscriptionRequest implements InternalPlcSubscriptionReq
FieldItem fieldItem = builderItem.encoder.apply(parsedField, null);
parsedFields.put(name, new ImmutablePair<>(parsedField, fieldItem));
});
- return new DefaultPlcSubscriptionRequest();
+ return new DefaultPlcSubscriptionRequest(subscriber);
}
private static class BuilderItem<T> {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
index 03e1f3e..45300a5 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
@@ -19,24 +19,35 @@
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
// TODO: request broken needs finishing.
public class DefaultPlcUnsubscriptionRequest implements InternalPlcUnsubscriptionRequest, InternalPlcFieldRequest {
+ private final PlcSubscriber subscriber;
+
private final Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles;
- public DefaultPlcUnsubscriptionRequest(Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+ public DefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+ this.subscriber = subscriber;
this.internalPlcSubscriptionHandles = internalPlcSubscriptionHandles;
}
@Override
+ public CompletableFuture<PlcUnsubscriptionResponse> execute() {
+ return subscriber.unsubscribe(this);
+ }
+
+ @Override
public int getNumberOfFields() {
throw new IllegalStateException("not available");
}
@@ -68,9 +79,11 @@ public class DefaultPlcUnsubscriptionRequest implements InternalPlcUnsubscriptio
public static class Builder implements PlcUnsubscriptionRequest.Builder {
+ private final PlcSubscriber subscriber;
private List<InternalPlcSubscriptionHandle> plcSubscriptionHandles;
- public Builder() {
+ public Builder(PlcSubscriber subscriber) {
+ this.subscriber = subscriber;
plcSubscriptionHandles = new ArrayList<>();
}
@@ -94,7 +107,7 @@ public class DefaultPlcUnsubscriptionRequest implements InternalPlcUnsubscriptio
@Override
public PlcUnsubscriptionRequest build() {
- return new DefaultPlcUnsubscriptionRequest(plcSubscriptionHandles);
+ return new DefaultPlcUnsubscriptionRequest(subscriber, plcSubscriptionHandles);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index c78ff08..d475b83 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -21,8 +21,10 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.base.connection.PlcFieldHandler;
import org.apache.plc4x.java.base.messages.items.FieldItem;
@@ -33,18 +35,26 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, InternalPlcFieldRequest {
+ private final PlcWriter writer;
private final LinkedHashMap<String, Pair<PlcField, FieldItem>> fields;
- protected DefaultPlcWriteRequest(LinkedHashMap<String, Pair<PlcField, FieldItem>> fields) {
+ protected DefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, FieldItem>> fields) {
+ this.writer = writer;
this.fields = fields;
}
@Override
+ public CompletableFuture<PlcWriteResponse> execute() {
+ return writer.write(this);
+ }
+
+ @Override
public int getNumberOfFields() {
return fields.size();
}
@@ -106,11 +116,13 @@ public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, Internal
public static class Builder implements PlcWriteRequest.Builder {
+ private final PlcWriter writer;
private final PlcFieldHandler fieldHandler;
private final Map<String, BuilderItem<Object>> fields;
private final Map<Class<?>, BiFunction<PlcField, Object[], FieldItem>> handlerMap;
- public Builder(PlcFieldHandler fieldHandler) {
+ public Builder(PlcWriter writer, PlcFieldHandler fieldHandler) {
+ this.writer = writer;
this.fieldHandler = fieldHandler;
fields = new TreeMap<>();
handlerMap = new HashMap<>();
@@ -236,7 +248,7 @@ public class DefaultPlcWriteRequest implements InternalPlcWriteRequest, Internal
FieldItem fieldItem = builderItem.encoder.apply(parsedField, builderItem.values);
parsedFields.put(name, new ImmutablePair<>(parsedField, fieldItem));
});
- return new DefaultPlcWriteRequest(parsedFields);
+ return new DefaultPlcWriteRequest(writer, parsedFields);
}
private Builder addItem(String name, String fieldQuery, Object[] values, BiFunction<PlcField, Object[], FieldItem> encoder) {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
index 8486388..78f6320 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcFieldResponse.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcFieldResponse;
-public interface InternalPlcFieldResponse<REQUEST_TYPE extends InternalPlcFieldRequest> extends PlcFieldResponse<REQUEST_TYPE> {
+public interface InternalPlcFieldResponse extends PlcFieldResponse {
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
index eb5aa3b..1bbea2f 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
@@ -20,5 +20,5 @@ package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
-public interface InternalPlcProprietaryResponse<REQUEST, RESPONSE> extends PlcProprietaryResponse<InternalPlcProprietaryRequest<REQUEST>, RESPONSE>, InternalPlcResponse<InternalPlcProprietaryRequest<REQUEST>> {
+public interface InternalPlcProprietaryResponse<RESPONSE> extends PlcProprietaryResponse<RESPONSE>, InternalPlcResponse {
}
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
index 775a4c7..53cf0b5 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcReadResponse.java
@@ -25,7 +25,7 @@ import org.apache.plc4x.java.base.messages.items.FieldItem;
import java.util.Map;
-public interface InternalPlcReadResponse extends PlcReadResponse<InternalPlcReadRequest>, InternalPlcResponse<InternalPlcReadRequest> {
+public interface InternalPlcReadResponse extends PlcReadResponse, InternalPlcResponse {
Map<String, Pair<PlcResponseCode, FieldItem>> getValues();
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
index 95c9223..dde16f0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcResponse.java
@@ -20,5 +20,6 @@ package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcResponse;
-public interface InternalPlcResponse<REQUEST_TYPE extends InternalPlcRequest> extends PlcResponse<REQUEST_TYPE> {
+public interface InternalPlcResponse extends PlcResponse {
+
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
index dbcdc5c..06d4ad7 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcWriteResponse.java
@@ -23,6 +23,6 @@ import org.apache.plc4x.java.api.types.PlcResponseCode;
import java.util.Map;
-public interface InternalPlcWriteResponse extends PlcWriteResponse<InternalPlcWriteRequest>, InternalPlcResponse<InternalPlcWriteRequest> {
+public interface InternalPlcWriteResponse extends PlcWriteResponse, InternalPlcResponse {
Map<String, PlcResponseCode> getValues();
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index a9c4a63..3b13a88 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -25,6 +25,8 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.PromiseCombiner;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
+import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.exceptions.PlcTimeoutException;
import org.apache.plc4x.java.api.model.PlcField;
@@ -49,26 +51,29 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
private final Timer timer;
+ private final PlcReader reader;
+ private final PlcWriter writer;
+
// TODO: maybe better get from map
private long defaultReceiveTimeout;
private PendingWriteQueue queue;
- private ConcurrentMap<PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>>, Timeout> scheduledTimeouts;
+ private ConcurrentMap<PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>, Timeout> scheduledTimeouts;
// Map to track send subcontainers
- private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>>> sentButUnacknowledgedSubContainer;
+ private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> sentButUnacknowledgedSubContainer;
// Map to map tdpu to original parent container
// TODO: currently this could be supplied via param, only reason to keep would be for statistics.
- private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>>> correlationToParentContainer;
+ private ConcurrentMap<Integer, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>> correlationToParentContainer;
// Map to track tdpus per container
// TODO: currently this could be supplied via param, only reason to keep would be for statistics.
private ConcurrentMap<PlcRequestContainer<?, ?>, Set<Integer>> containerCorrelationIdMap;
// Map to track a list of responses per parent container
- private ConcurrentMap<PlcRequestContainer<?, ?>, Queue<InternalPlcResponse<?>>> responsesToBeDelivered;
+ private ConcurrentMap<PlcRequestContainer<?, ?>, Queue<InternalPlcResponse>> responsesToBeDelivered;
private AtomicInteger correlationIdGenerator;
@@ -81,15 +86,17 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
private AtomicLong erroredItems;
- public SingleItemToSingleRequestProtocol(Timer timer) {
- this(timer, true);
+ public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, Timer timer) {
+ this(reader, writer, timer, true);
}
- public SingleItemToSingleRequestProtocol(Timer timer, boolean betterImplementationPossible) {
- this(timer, TimeUnit.SECONDS.toMillis(30), betterImplementationPossible);
+ public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, Timer timer, boolean betterImplementationPossible) {
+ this(reader, writer, timer, TimeUnit.SECONDS.toMillis(30), betterImplementationPossible);
}
- public SingleItemToSingleRequestProtocol(Timer timer, long defaultReceiveTimeout, boolean betterImplementationPossible) {
+ public SingleItemToSingleRequestProtocol(PlcReader reader, PlcWriter writer, Timer timer, long defaultReceiveTimeout, boolean betterImplementationPossible) {
+ this.reader = reader;
+ this.writer = writer;
this.timer = timer;
this.defaultReceiveTimeout = defaultReceiveTimeout;
if (betterImplementationPossible) {
@@ -155,16 +162,16 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
// Decoding
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- protected void tryFinish(Integer currentTdpu, InternalPlcResponse msg, CompletableFuture<InternalPlcResponse<?>> originalResponseFuture) {
+ protected void tryFinish(Integer currentTdpu, InternalPlcResponse msg, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
deliveredItems.incrementAndGet();
- PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
+ PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
LOGGER.info("{} got acknowledged", subPlcRequestContainer);
- PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
+ PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
if (originalPlcRequestContainer == null) {
LOGGER.warn("Unrelated package received {}", msg);
return;
}
- Queue<InternalPlcResponse<?>> correlatedResponseItems = responsesToBeDelivered.computeIfAbsent(originalPlcRequestContainer, ignore -> new ConcurrentLinkedQueue<>());
+ Queue<InternalPlcResponse> correlatedResponseItems = responsesToBeDelivered.computeIfAbsent(originalPlcRequestContainer, ignore -> new ConcurrentLinkedQueue<>());
correlatedResponseItems.add(msg);
Set<Integer> integers = containerCorrelationIdMap.get(originalPlcRequestContainer);
integers.remove(currentTdpu);
@@ -175,7 +182,7 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
timeout.cancel();
}
- InternalPlcResponse<?> plcResponse;
+ InternalPlcResponse plcResponse;
if (originalPlcRequestContainer.getRequest() instanceof InternalPlcReadRequest) {
InternalPlcReadRequest internalPlcReadRequest = (InternalPlcReadRequest) originalPlcRequestContainer.getRequest();
HashMap<String, Pair<PlcResponseCode, FieldItem>> fields = new HashMap<>();
@@ -206,13 +213,13 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
}
}
- protected void errored(Integer currentTdpu, Throwable throwable, CompletableFuture<InternalPlcResponse<?>> originalResponseFuture) {
+ protected void errored(Integer currentTdpu, Throwable throwable, CompletableFuture<InternalPlcResponse> originalResponseFuture) {
erroredItems.incrementAndGet();
- PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
+ PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> subPlcRequestContainer = sentButUnacknowledgedSubContainer.remove(currentTdpu);
LOGGER.info("{} got errored", subPlcRequestContainer);
- PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
+ PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> originalPlcRequestContainer = correlationToParentContainer.remove(currentTdpu);
if (originalPlcRequestContainer == null) {
LOGGER.warn("Unrelated error received tdpu:{}", currentTdpu, throwable);
} else {
@@ -246,7 +253,7 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
if (msg instanceof PlcRequestContainer) {
@SuppressWarnings("unchecked")
- PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> in = (PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>>) msg;
+ PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in = (PlcRequestContainer<InternalPlcRequest, InternalPlcResponse>) msg;
Set<Integer> tdpus = containerCorrelationIdMap.computeIfAbsent(in, plcRequestContainer -> ConcurrentHashMap.newKeySet());
Timeout timeout = timer.newTimeout(timeout_ -> handleTimeout(timeout_, in, tdpus, System.nanoTime()), defaultReceiveTimeout, TimeUnit.MILLISECONDS);
@@ -275,7 +282,7 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
}
});
- PlcRequestContainer<CorrelatedPlcReadRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcReadRequest.of(field, tdpu), correlatedCompletableFuture);
+ PlcRequestContainer<CorrelatedPlcReadRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcReadRequest.of(reader, field, tdpu), correlatedCompletableFuture);
correlationToParentContainer.put(tdpu, in);
queue.add(correlatedPlcRequestContainer, subPromise);
if (!tdpus.add(tdpu)) {
@@ -298,7 +305,7 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
tryFinish(tdpu, internalPlcResponse, in.getResponseFuture());
}
});
- PlcRequestContainer<CorrelatedPlcWriteRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcWriteRequest.of(fieldItemTriple, tdpu), correlatedCompletableFuture);
+ PlcRequestContainer<CorrelatedPlcWriteRequest, InternalPlcResponse> correlatedPlcRequestContainer = new PlcRequestContainer<>(CorrelatedPlcWriteRequest.of(writer, fieldItemTriple, tdpu), correlatedCompletableFuture);
correlationToParentContainer.put(tdpu, in);
queue.add(correlatedPlcRequestContainer, subPromise);
if (!tdpus.add(tdpu)) {
@@ -360,7 +367,7 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
ctx.flush();
}
- private void handleTimeout(Timeout timeout, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse<?>> in, Set<Integer> tdpus, long scheduledAt) {
+ private void handleTimeout(Timeout timeout, PlcRequestContainer<InternalPlcRequest, InternalPlcResponse> in, Set<Integer> tdpus, long scheduledAt) {
if (timeout.isCancelled()) {
LOGGER.debug("container {} with timeout {} got canceled", in, timeout);
return;
@@ -386,15 +393,15 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
protected final int tdpu;
- protected CorrelatedPlcReadRequest(LinkedHashMap<String, PlcField> fields, int tdpu) {
- super(fields);
+ protected CorrelatedPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields, int tdpu) {
+ super(reader, fields);
this.tdpu = tdpu;
}
- protected static CorrelatedPlcReadRequest of(Pair<String, PlcField> stringPlcFieldPair, int tdpu) {
+ protected static CorrelatedPlcReadRequest of(PlcReader reader, Pair<String, PlcField> stringPlcFieldPair, int tdpu) {
LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
fields.put(stringPlcFieldPair.getKey(), stringPlcFieldPair.getValue());
- return new CorrelatedPlcReadRequest(fields, tdpu);
+ return new CorrelatedPlcReadRequest(reader, fields, tdpu);
}
@Override
@@ -407,15 +414,15 @@ public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
private final int tdpu;
- public CorrelatedPlcWriteRequest(LinkedHashMap<String, Pair<PlcField, FieldItem>> fields, int tdpu) {
- super(fields);
+ public CorrelatedPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, FieldItem>> fields, int tdpu) {
+ super(writer, fields);
this.tdpu = tdpu;
}
- public static CorrelatedPlcWriteRequest of(Triple<String, PlcField, FieldItem> fieldItemTriple, int tdpu) {
+ public static CorrelatedPlcWriteRequest of(PlcWriter writer, Triple<String, PlcField, FieldItem> fieldItemTriple, int tdpu) {
LinkedHashMap<String, Pair<PlcField, FieldItem>> fields = new LinkedHashMap<>();
fields.put(fieldItemTriple.getLeft(), Pair.of(fieldItemTriple.getMiddle(), fieldItemTriple.getRight()));
- return new CorrelatedPlcWriteRequest(fields, tdpu);
+ return new CorrelatedPlcWriteRequest(writer, fields, tdpu);
}
@Override
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
index 47d06c5..c97d2a6 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
@@ -25,6 +25,9 @@ import io.netty.channel.PendingWriteQueue;
import io.netty.util.HashedWheelTimer;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcFieldRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcResponseCode;
@@ -52,8 +55,18 @@ import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class SingleItemToSingleRequestProtocolTest implements WithAssertions {
+ PlcReader mockReader = null;
+ PlcWriter mockWriter = null;
+ PlcSubscriber mockSubscriber = null;
+
@InjectMocks
- SingleItemToSingleRequestProtocol SUT = new SingleItemToSingleRequestProtocol(new HashedWheelTimer(), TimeUnit.SECONDS.toMillis(1), false);
+ SingleItemToSingleRequestProtocol SUT = new SingleItemToSingleRequestProtocol(
+ mockReader,
+ mockWriter,
+ new HashedWheelTimer(),
+ TimeUnit.SECONDS.toMillis(1),
+ false
+ );
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
ChannelHandlerContext channelHandlerContext;
@@ -138,7 +151,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
void simpleRead() throws Exception {
// Given
// we have a simple read
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
// When
// we write this
SUT.write(channelHandlerContext, msg, channelPromise);
@@ -169,7 +182,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
void partialRead() throws Exception {
// Given
// we have a simple read
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
// When
// we write this
SUT.write(channelHandlerContext, msg, channelPromise);
@@ -202,7 +215,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
void partialReadOneErrored() throws Exception {
// Given
// we have a simple read
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
// When
// we write this
SUT.write(channelHandlerContext, msg, channelPromise);
@@ -241,7 +254,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
void noRead() throws Exception {
// Given
// we have a simple read
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
// When
// we write this
SUT.write(channelHandlerContext, msg, channelPromise);
@@ -314,7 +327,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
@Test
void read() throws Exception {
// Given
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcReadRequest.build(mockReader), responseCompletableFuture);
// When
SUT.write(channelHandlerContext, msg, channelPromise);
// Then
@@ -345,7 +358,7 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
@Test
void write() throws Exception {
// Given
- PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(), responseCompletableFuture);
+ PlcRequestContainer<?, ?> msg = new PlcRequestContainer<>(TestDefaultPlcWriteRequest.build(mockWriter), responseCompletableFuture);
// When
SUT.write(channelHandlerContext, msg, channelPromise);
// Then
@@ -395,48 +408,51 @@ class SingleItemToSingleRequestProtocolTest implements WithAssertions {
}
private static class TestDefaultPlcReadRequest extends DefaultPlcReadRequest {
-
- private TestDefaultPlcReadRequest(LinkedHashMap<String, PlcField> fields) {
- super(fields);
+ private TestDefaultPlcReadRequest(PlcReader reader, LinkedHashMap<String, PlcField> fields) {
+ super(reader, fields);
}
- private static TestDefaultPlcReadRequest build() {
+ private static TestDefaultPlcReadRequest build(PlcReader reader) {
LinkedHashMap<String, PlcField> fields = new LinkedHashMap<>();
IntStream.rangeClosed(1, 5).forEach(i -> fields.put("readField" + i, mock(PlcField.class)));
- return new TestDefaultPlcReadRequest(fields);
+ return new TestDefaultPlcReadRequest(reader, fields);
}
}
private static class TestDefaultPlcWriteRequest extends DefaultPlcWriteRequest {
- private TestDefaultPlcWriteRequest(LinkedHashMap<String, Pair<PlcField, FieldItem>> fields) {
- super(fields);
+ private TestDefaultPlcWriteRequest(PlcWriter writer, LinkedHashMap<String, Pair<PlcField, FieldItem>> fields) {
+ super(writer, fields);
}
- private static TestDefaultPlcWriteRequest build() {
+ private static TestDefaultPlcWriteRequest build(PlcWriter writer) {
LinkedHashMap<String, Pair<PlcField, FieldItem>> fields = new LinkedHashMap<>();
IntStream.rangeClosed(1, 5).forEach(i -> fields.put("writeField" + i, Pair.of(mock(PlcField.class), mock(FieldItem.class))));
- return new TestDefaultPlcWriteRequest(fields);
+ return new TestDefaultPlcWriteRequest(writer, fields);
}
}
private static class TestDefaultPlcSubscriptionRequest extends DefaultPlcSubscriptionRequest {
- private static TestDefaultPlcSubscriptionRequest build() {
+ private TestDefaultPlcSubscriptionRequest(PlcSubscriber subscriber) {
+ super(subscriber);
+ }
+
+ private static TestDefaultPlcSubscriptionRequest build(PlcSubscriber subscriber) {
// TODO: implement me once available
- return new TestDefaultPlcSubscriptionRequest();
+ return new TestDefaultPlcSubscriptionRequest(subscriber);
}
}
private static class TestDefaultPlcUnsubscriptionRequest extends DefaultPlcUnsubscriptionRequest {
- private TestDefaultPlcUnsubscriptionRequest(Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
- super(internalPlcSubscriptionHandles);
+ private TestDefaultPlcUnsubscriptionRequest(PlcSubscriber subscriber, Collection<? extends InternalPlcSubscriptionHandle> internalPlcSubscriptionHandles) {
+ super(subscriber, internalPlcSubscriptionHandles);
}
- private static TestDefaultPlcUnsubscriptionRequest build() {
+ private static TestDefaultPlcUnsubscriptionRequest build(PlcSubscriber subscriber) {
// TODO: implement me once available
- return new TestDefaultPlcUnsubscriptionRequest(Collections.emptyList());
+ return new TestDefaultPlcUnsubscriptionRequest(subscriber, Collections.emptyList());
}
}
}
\ No newline at end of file
[incubator-plc4x] 03/19: implemented new api for ads protocol
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit b455aded8c4134656035e576796d2f76ab843757
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:26:34 2018 +0200
implemented new api for ads protocol
---
.../java/ads/connection/AdsAbstractPlcConnection.java | 18 +++++++++---------
.../java/ads/connection/AdsSerialPlcConnection.java | 2 +-
.../plc4x/java/ads/connection/AdsTcpPlcConnection.java | 14 +++++++-------
.../org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 4 ++--
.../org/apache/plc4x/java/ads/adslib/AmsRouter.java | 12 ++++++------
.../ads/connection/AdsAbstractPlcConnectionTest.java | 4 ++--
.../ads/connection/AdsSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java | 4 ++--
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index a80e5e7..5795a6f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -92,7 +92,7 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
mapFields(readRequest);
CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture));
@@ -107,11 +107,11 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new AdsPlcFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new AdsPlcFieldHandler());
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
mapFields(writeRequest);
CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture));
@@ -126,13 +126,13 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new AdsPlcFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new AdsPlcFieldHandler());
}
@Override
- public <PROP_REQUEST, PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PlcProprietaryRequest<PROP_REQUEST>, PROP_RESPONSE>> send(PlcProprietaryRequest<PROP_REQUEST> proprietaryRequest) {
- CompletableFuture<InternalPlcProprietaryResponse<PROP_REQUEST, PROP_RESPONSE>> sendFuture = new CompletableFuture<>();
- ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcProprietaryRequest<PROP_REQUEST>) proprietaryRequest, sendFuture));
+ public <PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PROP_RESPONSE>> send(PlcProprietaryRequest proprietaryRequest) {
+ CompletableFuture<InternalPlcProprietaryResponse<PROP_RESPONSE>> sendFuture = new CompletableFuture<>();
+ ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcProprietaryRequest) proprietaryRequest, sendFuture));
channelFuture.addListener(future -> {
if (!future.isSuccess()) {
sendFuture.completeExceptionally(future.cause());
@@ -168,9 +168,9 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
);
// TODO: This is blocking, should be changed to be async.
- CompletableFuture<InternalPlcProprietaryResponse<InternalPlcProprietaryRequest<AdsWriteRequest>, AdsReadWriteResponse>> getHandelFuture = new CompletableFuture<>();
+ CompletableFuture<InternalPlcProprietaryResponse<AdsReadWriteResponse>> getHandelFuture = new CompletableFuture<>();
channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsReadWriteRequest), getHandelFuture));
- InternalPlcProprietaryResponse<InternalPlcProprietaryRequest<AdsWriteRequest>, AdsReadWriteResponse> getHandleResponse = getFromFuture(getHandelFuture, SYMBOL_RESOLVE_TIMEOUT);
+ InternalPlcProprietaryResponse<AdsReadWriteResponse> getHandleResponse = getFromFuture(getHandelFuture, SYMBOL_RESOLVE_TIMEOUT);
AdsReadWriteResponse response = getHandleResponse.getResponse();
if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
index 06d52ca..cb2d00a 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
@@ -62,7 +62,7 @@ public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
pipeline.addLast(new SingleMessageRateLimiter());
pipeline.addLast(new Ads2PayloadProtocol());
pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
- pipeline.addLast(new SingleItemToSingleRequestProtocol(timer));
+ pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsSerialPlcConnection.this, AdsSerialPlcConnection.this, timer));
}
};
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 80fb5bb..8433526 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -114,7 +114,7 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
pipeline.addLast(new Payload2TcpProtocol());
pipeline.addLast(new Ads2PayloadProtocol());
pipeline.addLast(new Plc4x2AdsProtocol(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, fieldMapping));
- pipeline.addLast(new SingleItemToSingleRequestProtocol(timer));
+ pipeline.addLast(new SingleItemToSingleRequestProtocol(AdsTcpPlcConnection.this, AdsTcpPlcConnection.this, timer)); // TODO: remove nulls; implement correctly
}
};
}
@@ -204,9 +204,9 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
// Send the request to the plc and wait for a response
// TODO: This is blocking, should be changed to be async.
- CompletableFuture<InternalPlcProprietaryResponse<InternalPlcProprietaryRequest<AdsAddDeviceNotificationRequest>, AdsAddDeviceNotificationResponse>> addDeviceFuture = new CompletableFuture<>();
+ CompletableFuture<InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse>> addDeviceFuture = new CompletableFuture<>();
channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsAddDeviceNotificationRequest), addDeviceFuture));
- InternalPlcProprietaryResponse<InternalPlcProprietaryRequest<AdsAddDeviceNotificationRequest>, AdsAddDeviceNotificationResponse> addDeviceResponse = getFromFuture(addDeviceFuture, ADD_DEVICE_TIMEOUT);
+ InternalPlcProprietaryResponse<AdsAddDeviceNotificationResponse> addDeviceResponse = getFromFuture(addDeviceFuture, ADD_DEVICE_TIMEOUT);
AdsAddDeviceNotificationResponse response = addDeviceResponse.getResponse();
// Abort if we got anything but a successful response.
@@ -241,11 +241,11 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
Invoke.NONE,
adsSubscriptionHandle.getNotificationHandle()
);
- CompletableFuture<InternalPlcProprietaryResponse<DefaultPlcProprietaryRequest<AdsDeleteDeviceNotificationRequest>, AdsDeleteDeviceNotificationResponse>> deleteDeviceFuture =
+ CompletableFuture<InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> deleteDeviceFuture =
new CompletableFuture<>();
channel.writeAndFlush(new PlcRequestContainer<>(new DefaultPlcProprietaryRequest<>(adsDeleteDeviceNotificationRequest), deleteDeviceFuture));
- InternalPlcProprietaryResponse<DefaultPlcProprietaryRequest<AdsDeleteDeviceNotificationRequest>, AdsDeleteDeviceNotificationResponse> deleteDeviceResponse =
+ InternalPlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> deleteDeviceResponse =
getFromFuture(deleteDeviceFuture, DEL_DEVICE_TIMEOUT);
AdsDeleteDeviceNotificationResponse response = deleteDeviceResponse.getResponse();
if (response.getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
@@ -311,12 +311,12 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
@Override
public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
- return new DefaultPlcSubscriptionRequest.Builder(new AdsPlcFieldHandler());
+ return new DefaultPlcSubscriptionRequest.Builder(this, new AdsPlcFieldHandler());
}
@Override
public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
- return new DefaultPlcUnsubscriptionRequest.Builder();
+ return new DefaultPlcUnsubscriptionRequest.Builder(this);
}
@Override
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index b4da510..bca72a5 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -47,8 +47,8 @@ public class ManualPlc4XAdsTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- CompletableFuture<PlcReadResponse<?>> response = reader.read(builder -> builder.addItem("station", "Allgemein_S2.Station:BYTE"));
- PlcReadResponse<?> readResponse = response.get();
+ CompletableFuture<PlcReadResponse> response = reader.read(builder -> builder.addItem("station", "Allgemein_S2.Station:BYTE"));
+ PlcReadResponse readResponse = response.get();
System.out.println("Response " + readResponse);
Collection<Integer> stations = readResponse.getAllIntegers("station");
stations.forEach(System.out::println);
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
index 935fc87..ed1ccc4 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
@@ -202,9 +202,9 @@ public class AmsRouter {
if (ads == null) {
return AmsError.of(AdsReturnCode.ADS_CODE_7);
}
- CompletableFuture<PlcProprietaryResponse<PlcProprietaryRequest<T>, R>> completableFuture = ads.send(plcProprietaryRequest);
+ CompletableFuture<PlcProprietaryResponse<R>> completableFuture = ads.send(plcProprietaryRequest);
try {
- PlcProprietaryResponse<PlcProprietaryRequest<T>, R> response = completableFuture.get(3, TimeUnit.SECONDS);
+ PlcProprietaryResponse<R> response = completableFuture.get(3, TimeUnit.SECONDS);
request.getResponseFuture().complete(response.getResponse());
return response.getResponse().getAmsHeader().getCode();
} catch (ExecutionException | TimeoutException e) {
@@ -229,9 +229,9 @@ public class AmsRouter {
}
AdsLibPort port = ports.get(plcProprietaryRequest.getProprietaryRequest().getAmsHeader().getSourceAmsPort().getAsInt());
- CompletableFuture<PlcProprietaryResponse<PlcProprietaryRequest<AdsAddDeviceNotificationRequest>, AdsAddDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
+ CompletableFuture<PlcProprietaryResponse<AdsAddDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
try {
- PlcProprietaryResponse<PlcProprietaryRequest<AdsAddDeviceNotificationRequest>, AdsAddDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
+ PlcProprietaryResponse<AdsAddDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
if (response.getResponse().getResult().toAdsReturnCode() != AdsReturnCode.ADS_CODE_0) {
return AmsError.of(response.getResponse().getResult().getAsLong());
}
@@ -258,9 +258,9 @@ public class AmsRouter {
}
AdsLibPort adsLibPort = ports.get(port);
- CompletableFuture<PlcProprietaryResponse<PlcProprietaryRequest<AdsDeleteDeviceNotificationRequest>, AdsDeleteDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
+ CompletableFuture<PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse>> send = ads.send(plcProprietaryRequest);
try {
- PlcProprietaryResponse<PlcProprietaryRequest<AdsDeleteDeviceNotificationRequest>, AdsDeleteDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
+ PlcProprietaryResponse<AdsDeleteDeviceNotificationResponse> response = send.get(3, TimeUnit.SECONDS);
adsLibPort.DelNotification(pAddr, plcProprietaryRequest.getProprietaryRequest().getNotificationHandle());
request.getResponseFuture().complete(response.getResponse());
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
index 69ca500..8052624 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
@@ -123,7 +123,7 @@ public class AdsAbstractPlcConnectionTest {
@Test
public void read() {
- CompletableFuture<PlcReadResponse<?>> read = SUT.read(mock(InternalPlcReadRequest.class));
+ CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
assertNotNull(read);
simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
@@ -131,7 +131,7 @@ public class AdsAbstractPlcConnectionTest {
@Test
public void write() {
- CompletableFuture<PlcWriteResponse<?>> write = SUT.write(mock(InternalPlcWriteRequest.class));
+ CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
assertNotNull(write);
simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
index a4a8825..9988da3 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
@@ -75,7 +75,7 @@ public class AdsSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- CompletableFuture<PlcReadResponse<?>> read = SUT.read(builder -> builder.addItem("test", "0/0:BYTE"));
+ CompletableFuture<PlcReadResponse> read = SUT.read(builder -> builder.addItem("test", "0/0:BYTE"));
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
index 95c6628..2cdd449 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java
@@ -110,14 +110,14 @@ public class Plc4x2AdsProtocolTest {
.map(pair -> Stream.of(
ImmutablePair.of(
new PlcRequestContainer<>(
- (InternalPlcRequest) new DefaultPlcWriteRequest.Builder(new AdsPlcFieldHandler())
+ (InternalPlcRequest) new DefaultPlcWriteRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
.addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType, pair.getValue())
.build(), new CompletableFuture<>()),
AdsWriteResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0))
),
ImmutablePair.of(
new PlcRequestContainer<>(
- (InternalPlcRequest) new DefaultPlcReadRequest.Builder(new AdsPlcFieldHandler())
+ (InternalPlcRequest) new DefaultPlcReadRequest.Builder(null, new AdsPlcFieldHandler()) // TODO: remove null
.addItem(RandomStringUtils.randomAscii(10), "1/1:" + pair.adsDataType)
.build(), new CompletableFuture<>()),
AdsReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), Data.of(pair.getByteRepresentation()))
[incubator-plc4x] 18/19: allow multiple connections in kafka
connector
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 48dbad00b18c59c70bbe5e94160ec7a1f04b4c6a
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Fri Oct 12 13:22:02 2018 +0200
allow multiple connections in kafka connector
---
integrations/apache-kafka/config/source.properties | 3 +-
.../apache/plc4x/kafka/Plc4xSourceConnector.java | 45 +++++++++++-----------
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 30 ++++++++++++---
3 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/integrations/apache-kafka/config/source.properties b/integrations/apache-kafka/config/source.properties
index cbd00f5..afa7e93 100644
--- a/integrations/apache-kafka/config/source.properties
+++ b/integrations/apache-kafka/config/source.properties
@@ -19,6 +19,5 @@ limitations under the License.
name=plc-source-test
connector.class=org.apache.plc4x.kafka.Plc4xSourceConnector
topic=test
-url=test:unused
-queries=RANDOM/foo:INTEGER,RANDOM/bar:STRING
+queries=test:unused#RANDOM/foo:INTEGER,test:another#RANDOM/bar:STRING
rate=2000
\ No newline at end of file
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
index 4d014a5..bb1392e 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceConnector.java
@@ -22,36 +22,28 @@ import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.connect.connector.Task;
import org.apache.kafka.connect.source.SourceConnector;
-import org.apache.kafka.connect.util.ConnectorUtils;
import org.apache.plc4x.kafka.util.VersionUtil;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
public class Plc4xSourceConnector extends SourceConnector {
- static final String TOPIC_CONFIG = "topic";
+ private static final String TOPIC_CONFIG = "topic";
private static final String TOPIC_DOC = "Kafka topic to publish to";
- static final String URL_CONFIG = "url";
- private static final String URL_DOC = "Connection string used by PLC4X to connect to the PLC";
-
- static final String QUERIES_CONFIG = "queries";
+ private static final String QUERIES_CONFIG = "queries";
private static final String QUERIES_DOC = "Field queries to be sent to the PLC";
- static final String RATE_CONFIG = "rate";
+ private static final String RATE_CONFIG = "rate";
private static final Integer RATE_DEFAULT = 1000;
private static final String RATE_DOC = "Polling rate";
- static final ConfigDef CONFIG_DEF = new ConfigDef()
+ private static final ConfigDef CONFIG_DEF = new ConfigDef()
.define(TOPIC_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, TOPIC_DOC)
- .define(URL_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, URL_DOC)
.define(QUERIES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, QUERIES_DOC)
.define(RATE_CONFIG, ConfigDef.Type.INT, RATE_DEFAULT, ConfigDef.Importance.MEDIUM, RATE_DOC);
private String topic;
- private String url;
private List<String> queries;
private Integer rate;
@@ -63,23 +55,30 @@ public class Plc4xSourceConnector extends SourceConnector {
@Override
public List<Map<String, String>> taskConfigs(int maxTasks) {
List<Map<String, String>> configs = new LinkedList<>();
- List<List<String>> queryGroups = ConnectorUtils.groupPartitions(queries, maxTasks);
- for (List<String> queryGroup: queryGroups) {
+ Map<String, List<String>> groupedByHost = new HashMap<>();
+ queries.stream().map(query -> query.split("#", 2)).collect(Collectors.groupingBy(parts -> parts[0])).forEach((host, queries) -> {
+ groupedByHost.put(host, queries.stream().map(parts -> parts[1]).collect(Collectors.toList()));
+ });
+ if (groupedByHost.size() > maxTasks) {
+ // Not enough tasks
+ // TODO: throw exception?
+ return Collections.emptyList();
+ }
+ groupedByHost.forEach((host, qs) -> {
Map<String, String> taskConfig = new HashMap<>();
- taskConfig.put(TOPIC_CONFIG, topic);
- taskConfig.put(URL_CONFIG, url);
- taskConfig.put(QUERIES_CONFIG, String.join(",", queryGroup));
- taskConfig.put(RATE_CONFIG, rate.toString());
+ taskConfig.put(Plc4xSourceTask.TOPIC_CONFIG, topic);
+ taskConfig.put(Plc4xSourceTask.URL_CONFIG, host);
+ taskConfig.put(Plc4xSourceTask.QUERIES_CONFIG, String.join(",", qs));
+ taskConfig.put(Plc4xSourceTask.RATE_CONFIG, rate.toString());
configs.add(taskConfig);
- }
+ });
return configs;
}
@Override
public void start(Map<String, String> props) {
- AbstractConfig config = new AbstractConfig(Plc4xSourceConnector.CONFIG_DEF, props);
+ AbstractConfig config = new AbstractConfig(CONFIG_DEF, props);
topic = config.getString(TOPIC_CONFIG);
- url = config.getString(URL_CONFIG);
queries = config.getList(QUERIES_CONFIG);
rate = config.getInt(RATE_CONFIG);
}
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 2bbc56b..f172a38 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -19,6 +19,7 @@ under the License.
package org.apache.plc4x.kafka;
import org.apache.kafka.common.config.AbstractConfig;
+import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.apache.kafka.connect.data.Struct;
@@ -43,6 +44,25 @@ import java.util.concurrent.*;
* If the flag does not become true, the method returns null, otherwise a fetch is performed.
*/
public class Plc4xSourceTask extends SourceTask {
+ static final String TOPIC_CONFIG = "topic";
+ private static final String TOPIC_DOC = "Kafka topic to publish to";
+
+ static final String URL_CONFIG = "url";
+ private static final String URL_DOC = "PLC URL";
+
+ static final String QUERIES_CONFIG = "queries";
+ private static final String QUERIES_DOC = "Field queries to be sent to the PLC";
+
+ static final String RATE_CONFIG = "rate";
+ private static final Integer RATE_DEFAULT = 1000;
+ private static final String RATE_DOC = "Polling rate";
+
+ private static final ConfigDef CONFIG_DEF = new ConfigDef()
+ .define(TOPIC_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, TOPIC_DOC)
+ .define(URL_CONFIG, ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, URL_DOC)
+ .define(QUERIES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, QUERIES_DOC)
+ .define(RATE_CONFIG, ConfigDef.Type.INT, RATE_DEFAULT, ConfigDef.Importance.MEDIUM, RATE_DOC);
+
private final static long WAIT_LIMIT_MILLIS = 100;
private final static long TIMEOUT_LIMIT_MILLIS = 5000;
@@ -72,10 +92,10 @@ public class Plc4xSourceTask extends SourceTask {
@Override
public void start(Map<String, String> props) {
- AbstractConfig config = new AbstractConfig(Plc4xSourceConnector.CONFIG_DEF, props);
- topic = config.getString(Plc4xSourceConnector.TOPIC_CONFIG);
- url = config.getString(Plc4xSourceConnector.URL_CONFIG);
- queries = config.getList(Plc4xSourceConnector.QUERIES_CONFIG);
+ AbstractConfig config = new AbstractConfig(CONFIG_DEF, props);
+ topic = config.getString(TOPIC_CONFIG);
+ url = config.getString(URL_CONFIG);
+ queries = config.getList(QUERIES_CONFIG);
openConnection();
@@ -83,7 +103,7 @@ public class Plc4xSourceTask extends SourceTask {
throw new ConnectException("Reading not supported on this connection");
}
- int rate = Integer.valueOf(props.get(Plc4xSourceConnector.RATE_CONFIG));
+ int rate = Integer.valueOf(props.get(RATE_CONFIG));
scheduler = Executors.newScheduledThreadPool(1);
scheduler.scheduleAtFixedRate(Plc4xSourceTask.this::scheduleFetch, rate, rate, TimeUnit.MILLISECONDS);
}
[incubator-plc4x] 10/19: moved Request Builder factories to
PlcConnection
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit e60f924c69be29890d62f3df6df4aeace6575965
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 15:22:12 2018 +0200
moved Request Builder factories to PlcConnection
---
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 2 +-
.../dummydriver/connection/DummyConnection.java | 32 +++++++++++++--------
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 2 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 2 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 4 +--
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 5 ++--
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 2 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 7 +++--
.../java/org/apache/plc4x/camel/MockDriver.java | 7 +++++
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 1 +
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 7 +++++
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 8 +++---
.../apache/plc4x/edgent/mock/MockConnection.java | 9 +++---
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 2 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 2 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 6 ++--
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 6 ++--
.../plc4x/java/api/connection/PlcConnection.java | 6 ++--
.../java/api/connection/PlcProprietarySender.java | 1 -
.../plc4x/java/api/connection/PlcReader.java | 2 +-
.../plc4x/java/api/connection/PlcSubscriber.java | 4 +--
.../plc4x/java/api/connection/PlcWriter.java | 2 +-
.../org/apache/plc4x/java/mock/MockConnection.java | 26 +++++++++++++++++
.../ads/connection/AdsAbstractPlcConnection.java | 29 +++++++++++++------
.../ads/connection/AdsSerialPlcConnection.java | 3 ++
.../java/ads/connection/AdsTcpPlcConnection.java | 14 +++++----
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 6 ++--
.../ads/connection/AdsSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/base/connection/MockConnection.java | 26 ++++++++++++++++-
.../connection/BaseEtherNetIpPlcConnection.java | 20 +++++++------
.../connection/EtherNetIpTcpPlcConnection.java | 13 +++++++++
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 2 +-
.../modbus/connection/BaseModbusPlcConnection.java | 30 ++++++++++++--------
.../modbus/connection/ModbusTcpPlcConnection.java | 3 ++
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 10 +++----
.../connection/ModbusSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 30 ++++++++++++--------
.../apache/plc4x/java/s7/issues/PLC4X47Test.java | 2 +-
.../org/apache/plc4x/java/test/TestConnection.java | 33 ++++++++++++++++------
39 files changed, 258 insertions(+), 112 deletions(-)
diff --git a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
index 7bb03ec..a4f80cc 100644
--- a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
+++ b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
@@ -66,7 +66,7 @@ public class S7PlcToAzureIoTHubSample {
PlcReader plcReader = plcConnection.getReader().orElseThrow(IllegalStateException::new);
// Prepare a read request.
- PlcReadRequest request = plcReader.readRequestBuilder().addItem(FIELD_NAME, addressString).build();
+ PlcReadRequest request = plcConnection.readRequestBuilder().get().addItem(FIELD_NAME, addressString).build();
while (!Thread.currentThread().isInterrupted()) {
// Simulate telemetry.
diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
index 4b7c00a..8fc73b4 100644
--- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
+++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
@@ -23,10 +23,7 @@ import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
-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.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
import org.apache.plc4x.java.base.messages.*;
@@ -34,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetAddress;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class DummyConnection extends AbstractPlcConnection implements PlcReader, PlcWriter {
@@ -58,9 +56,25 @@ public class DummyConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
// TODO: Implement this ...
- return null;
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ // TODO: Implement this ...
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
}
@Override
@@ -74,12 +88,6 @@ public class DummyConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- // TODO: Implement this ...
- return null;
- }
-
- @Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
diff --git a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
index 29d25a3..fba969c 100644
--- a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
+++ b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
@@ -235,7 +235,7 @@ public class S7PlcToGoogleIoTCoreSample {
PlcReader plcReader = plcConnection.getReader().orElseThrow(IllegalAccessError::new);
- PlcReadRequest readRequest = plcReader.readRequestBuilder().addItem("outputs", "OUTPUTS/0").build();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("outputs", "OUTPUTS/0").build();
while (!Thread.currentThread().isInterrupted()) {
diff --git a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index d149ba5..402c856 100644
--- a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -57,7 +57,7 @@ public class HelloPlc4x {
// Create a new read request:
// - Give the single item requested the alias name "value"
- PlcReadRequest.Builder builder = plcReader.readRequestBuilder();
+ PlcReadRequest.Builder builder = plcConnection.readRequestBuilder().get();
for (int i = 1; i < args.length; i++) {
builder.addItem("value-" + i, args[i]);
}
diff --git a/examples/plclogger/src/main/java/org/apache/plc4x/java/examples/plclogger/PlcLogger.java b/examples/plclogger/src/main/java/org/apache/plc4x/java/examples/plclogger/PlcLogger.java
index ffc14ec..bd2a066 100644
--- a/examples/plclogger/src/main/java/org/apache/plc4x/java/examples/plclogger/PlcLogger.java
+++ b/examples/plclogger/src/main/java/org/apache/plc4x/java/examples/plclogger/PlcLogger.java
@@ -18,8 +18,6 @@ under the License.
*/
package org.apache.plc4x.java.examples.plclogger;
-import java.util.concurrent.TimeUnit;
-
import org.apache.edgent.function.Supplier;
import org.apache.edgent.providers.direct.DirectProvider;
import org.apache.edgent.topology.TStream;
@@ -27,6 +25,8 @@ import org.apache.edgent.topology.Topology;
import org.apache.plc4x.edgent.PlcConnectionAdapter;
import org.apache.plc4x.edgent.PlcFunctions;
+import java.util.concurrent.TimeUnit;
+
public class PlcLogger {
public static void main(String[] args) throws Exception {
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
index 7887f02..9ec281c 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
@@ -27,7 +27,6 @@ import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,7 +83,7 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(
() -> new PlcException("Connection doesn't support subscriptions."));
// TODO: Is it correct to only support one field?
- PlcSubscriptionRequest request = plcSubscriber.subscriptionRequestBuilder()
+ PlcSubscriptionRequest request = plcConnection.subscriptionRequestBuilder().get()
.addCyclicField("default", fieldQuery, Duration.of(3, ChronoUnit.SECONDS)).build();
PlcSubscriptionResponse plcSubscriptionResponse = plcSubscriber.subscribe(request).get();
// TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
@@ -95,7 +94,7 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
protected void doStop() throws InterruptedException, ExecutionException, TimeoutException, PlcException {
PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(
() -> new PlcException("Connection doesn't support subscriptions."));
- PlcUnsubscriptionRequest request = plcSubscriber.unsubscriptionRequestBuilder().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
+ PlcUnsubscriptionRequest request = plcConnection.unsubscriptionRequestBuilder().get().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionFuture = plcSubscriber.unsubscribe(request);
PlcUnsubscriptionResponse unsubscriptionResponse = unsubscriptionFuture.get(5, TimeUnit.SECONDS);
// TODO: Handle the response ...
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
index 395398e..4aee7ad 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
@@ -55,7 +55,7 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
this.plcReader = plcConnection.getReader().orElseThrow(() -> new PlcException("This connection doesn't support reading."));
- readRequest = plcReader.readRequestBuilder().addItem("default", endpoint.getAddress()).build();
+ readRequest = plcConnection.readRequestBuilder().get().addItem("default", endpoint.getAddress()).build();
}
@Override
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 01acff0..b4adbcc 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
@@ -34,14 +34,15 @@ import java.util.concurrent.atomic.AtomicInteger;
public class Plc4XProducer extends DefaultAsyncProducer {
private PlcConnection plcConnection;
- private PlcWriter plcWriter;
private AtomicInteger openRequests;
public Plc4XProducer(Plc4XEndpoint endpoint) throws PlcException {
super(endpoint);
String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
- plcWriter = plcConnection.getWriter().orElseThrow(() -> new PlcException("This connection doesn't support writing."));
+ if (!plcConnection.writeRequestBuilder().isPresent()) {
+ throw new PlcException("This connection (" + plc4xURI + ") doesn't support writing.");
+ }
openRequests = new AtomicInteger();
}
@@ -51,7 +52,6 @@ public class Plc4XProducer extends DefaultAsyncProducer {
String fieldName = in.getHeader(Constants.FIELD_NAME_HEADER, String.class);
String fieldQuery = in.getHeader(Constants.FIELD_QUERY_HEADER, String.class);
Object body = in.getBody();
- PlcWriteRequest.Builder builder = plcWriter.writeRequestBuilder();
if (body instanceof List) {
List<?> bodyList = in.getBody(List.class);
Object[] values = bodyList.toArray();
@@ -61,6 +61,7 @@ public class Plc4XProducer extends DefaultAsyncProducer {
// builder.addItem(fieldName, fieldQuery, value);
}
PlcWriter plcWriter = plcConnection.getWriter().orElseThrow(() -> new IllegalArgumentException("Writer for driver not found"));
+ PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder().orElseThrow(() -> new IllegalArgumentException("Writer for driver not found"));
CompletableFuture<? extends PlcWriteResponse> completableFuture = plcWriter.write(builder.build());
int currentlyOpenRequests = openRequests.incrementAndGet();
try {
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
index fb99abe..9a3ea9e 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
@@ -21,10 +21,13 @@ package org.apache.plc4x.camel;
import org.apache.plc4x.java.api.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
import org.slf4j.Logger;
@@ -59,6 +62,10 @@ public class MockDriver implements PlcDriver {
// Mock a connection.
PlcConnection plcConnectionMock = mock(PlcConnection.class, RETURNS_DEEP_STUBS);
when(plcConnectionMock.getWriter()).thenReturn(Optional.of(mock(PlcWriter.class, RETURNS_DEEP_STUBS)));
+ when(plcConnectionMock.getReader()).thenReturn(Optional.of(mock(PlcReader.class, RETURNS_DEEP_STUBS)));
+ when(plcConnectionMock.readRequestBuilder()).thenReturn(Optional.of(mock(PlcReadRequest.Builder.class, RETURNS_DEEP_STUBS)));
+ when(plcConnectionMock.writeRequestBuilder()).thenReturn(Optional.of(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS)));
+ when(plcConnectionMock.subscriptionRequestBuilder()).thenReturn(Optional.of(mock(PlcSubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS)));
// Mock a typical subscriber.
PlcSubscriber plcSubscriber = mock(PlcSubscriber.class, RETURNS_DEEP_STUBS);
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
index d29b148..b849e2c 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
@@ -37,6 +37,7 @@ public class Plc4XEndpointTest {
SUT = new Plc4XEndpoint("plc4x:mock:10.10.10.1/1/1", mock(Component.class));
}
+ // TODO: figure out what this is
@Test
public void createProducer() throws Exception {
assertThat(SUT.createProducer(), notNullValue());
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
index f35ce3d..60706d6 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
@@ -23,6 +23,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.junit.Before;
import org.junit.Test;
@@ -45,8 +47,13 @@ public class Plc4XProducerTest {
Plc4XEndpoint endpointMock = mock(Plc4XEndpoint.class, RETURNS_DEEP_STUBS);
when(endpointMock.getEndpointUri()).thenReturn("plc4x:mock:10.10.10.1/1/1");
PlcDriverManager plcDriverManagerMock = mock(PlcDriverManager.class, RETURNS_DEEP_STUBS);
+
when(plcDriverManagerMock.getConnection(anyString()).getWriter())
.thenReturn(Optional.of(mock(PlcWriter.class, RETURNS_DEEP_STUBS)));
+
+ when(plcDriverManagerMock.getConnection(anyString()).writeRequestBuilder())
+ .thenReturn(Optional.of(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS)));
+
when(endpointMock.getPlcDriverManager()).thenReturn(plcDriverManagerMock);
SUT = new Plc4XProducer(endpointMock);
testExchange = mock(Exchange.class, RETURNS_DEEP_STUBS);
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index 9ce5d92..4e1fbcd 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -104,8 +104,8 @@ public class PlcConnectionAdapter implements AutoCloseable {
}
public PlcReadRequest.Builder readRequestBuilder() throws PlcException {
- return getConnection().getReader().orElseThrow(
- () -> new PlcException("This connection doesn't support reading")).readRequestBuilder();
+ return getConnection().readRequestBuilder().orElseThrow(
+ () -> new PlcException("This connection doesn't support reading"));
}
Supplier<PlcReadResponse> newSupplier(PlcReadRequest readRequest) {
@@ -156,7 +156,7 @@ public class PlcConnectionAdapter implements AutoCloseable {
connection = getConnection();
PlcReader reader = connection.getReader()
.orElseThrow(() -> new PlcException("This connection doesn't support reading"));
- PlcReadRequest readRequest = reader.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
+ PlcReadRequest readRequest = connection.readRequestBuilder().orElseThrow(() -> new PlcException("This connection doesn't support reading")).addItem(FIELD_NAME, fieldQuery).build();
PlcReadResponse readResponse = reader.read(readRequest).get();
Object value = null;
switch (clientDatatype) {
@@ -221,7 +221,7 @@ public class PlcConnectionAdapter implements AutoCloseable {
connection = getConnection();
PlcWriter writer = connection.getWriter()
.orElseThrow(() -> new PlcException("This connection doesn't support writing"));
- PlcWriteRequest.Builder builder = writer.writeRequestBuilder();
+ PlcWriteRequest.Builder builder = connection.writeRequestBuilder().orElseThrow(() -> new PlcException("This connection doesn't support writing"));
PlcWriteRequest writeRequest = builder.build();
addItem(builder, clientDatatype, fieldQuery, fieldValue);
writer.write(writeRequest).get();
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index e569e1e..f6de8d4 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -36,6 +36,7 @@ import org.apache.plc4x.java.base.messages.items.FieldItem;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class MockConnection extends org.apache.plc4x.java.base.connection.MockConnection implements PlcReader, PlcWriter {
@@ -67,8 +68,8 @@ public class MockConnection extends org.apache.plc4x.java.base.connection.MockCo
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new MockFieldHandler()));
}
@Override
@@ -90,8 +91,8 @@ public class MockConnection extends org.apache.plc4x.java.base.connection.MockCo
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler()));
}
@SuppressWarnings("unchecked")
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
index 648a32e..6829294 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
@@ -65,7 +65,7 @@ public class Plc4xSinkTask extends SinkTask {
for (SinkRecord record: records) {
String query = record.key().toString();
Object value = record.value();
- PlcWriteRequest.Builder builder = plcWriter.writeRequestBuilder();
+ PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder().get();
PlcWriteRequest plcRequest = addToBuilder(builder, query, value).build();
doWrite(plcRequest);
}
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 62fbb12..08b3ec1 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -86,7 +86,7 @@ public class Plc4xSourceTask extends SourceTask {
.orElseThrow(() -> new ConnectException("PlcReader not available for this type of connection"));
- PlcReadRequest.Builder builder = plcReader.readRequestBuilder();
+ PlcReadRequest.Builder builder = plcConnection.readRequestBuilder().get();
for (String query : queries) {
builder.addItem(query, query);
}
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
index ab7b0a0..973855b 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
@@ -28,6 +28,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
@@ -51,11 +52,12 @@ public class Plc4xSinkProcessor extends BasePlc4xProcessor {
}
// Get an instance of a component able to write to a PLC.
- PlcWriter writer = getConnection().getWriter().orElseThrow(
+ PlcConnection connection = getConnection();
+ PlcWriter writer = connection.getWriter().orElseThrow(
() -> new ProcessException("Writing not supported by connection"));
// Prepare the request.
- PlcWriteRequest.Builder builder = writer.writeRequestBuilder();
+ PlcWriteRequest.Builder builder = connection.writeRequestBuilder().get();
flowFile.getAttributes().forEach((field, value) -> {
String address = getAddress(field);
if(address != null) {
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
index f3dbb59..190a00d 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
@@ -27,6 +27,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
+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;
@@ -45,11 +46,12 @@ public class Plc4xSourceProcessor extends BasePlc4xProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
// Get an instance of a component able to read from a PLC.
- PlcReader reader = getConnection().getReader().orElseThrow(
+ PlcConnection connection = getConnection();
+ PlcReader reader = connection.getReader().orElseThrow(
() -> new ProcessException("Writing not supported by connection"));
// Prepare the request.
- PlcReadRequest.Builder builder = reader.readRequestBuilder();
+ PlcReadRequest.Builder builder = connection.readRequestBuilder().get();
getFields().forEach(field -> {
String address = getAddress(field);
if(address != null) {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
index 4c2b197..66a3778 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
@@ -57,13 +57,15 @@ public interface PlcConnection extends AutoCloseable {
@Override
void close() throws Exception;
- /*Optional<PlcReadRequest.Builder> readRequestBuilder();
+ Optional<PlcReadRequest.Builder> readRequestBuilder();
Optional<PlcWriteRequest.Builder> writeRequestBuilder();
Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder();
- Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder();*/
+ Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder();
+
+ // the following methods should be moved to the SPI
Optional<PlcReader> getReader();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
index 2a053cb..80db408 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
@@ -24,6 +24,5 @@ import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
import java.util.concurrent.CompletableFuture;
public interface PlcProprietarySender {
-
<T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index b78d306..6d50da0 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -37,6 +37,6 @@ public interface PlcReader {
*/
CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
- PlcReadRequest.Builder readRequestBuilder();
+ //PlcReadRequest.Builder readRequestBuilder();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
index 1f582cb..d1c97ba 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
@@ -62,8 +62,8 @@ public interface PlcSubscriber {
*/
void unregister(PlcConsumerRegistration registration);
- PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
+ //PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
- PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder();
+ //PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index b22977f..a4e44bf 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -37,6 +37,6 @@ public interface PlcWriter {
*/
CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
- PlcWriteRequest.Builder writeRequestBuilder();
+ //PlcWriteRequest.Builder writeRequestBuilder();
}
diff --git a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockConnection.java b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockConnection.java
index 0be37f9..fc52100 100644
--- a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockConnection.java
+++ b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockConnection.java
@@ -22,10 +22,15 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.TestChannelFactory;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class MockConnection extends AbstractPlcConnection {
@@ -38,6 +43,27 @@ public class MockConnection extends AbstractPlcConnection {
}
@Override
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+
+ @Override
protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
return new ChannelInitializer() {
@Override
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index 5795a6f..de0e75d 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -43,6 +43,7 @@ import org.apache.plc4x.java.base.messages.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Optional;
import java.util.concurrent.*;
public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcProprietarySender {
@@ -106,8 +107,23 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new AdsPlcFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new AdsPlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new AdsPlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
}
@Override
@@ -125,13 +141,8 @@ public abstract class AdsAbstractPlcConnection extends AbstractPlcConnection imp
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new AdsPlcFieldHandler());
- }
-
- @Override
- public <PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PROP_RESPONSE>> send(PlcProprietaryRequest proprietaryRequest) {
- CompletableFuture<InternalPlcProprietaryResponse<PROP_RESPONSE>> sendFuture = new CompletableFuture<>();
+ public <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest) {
+ CompletableFuture<InternalPlcProprietaryResponse<T>> sendFuture = new CompletableFuture<>();
ChannelFuture channelFuture = channel.writeAndFlush(new PlcRequestContainer<>((InternalPlcProprietaryRequest) proprietaryRequest, sendFuture));
channelFuture.addListener(future -> {
if (!future.isSuccess()) {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
index cb2d00a..3d4c8ba 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnection.java
@@ -28,9 +28,12 @@ import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
import org.apache.plc4x.java.ads.protocol.Payload2SerialProtocol;
import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
import org.apache.plc4x.java.ads.protocol.util.SingleMessageRateLimiter;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
import org.apache.plc4x.java.base.connection.SerialChannelFactory;
import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class AdsSerialPlcConnection extends AdsAbstractPlcConnection {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index d88dee7..4d582e7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -43,7 +43,6 @@ import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.model.DefaultPlcConsumerRegistration;
import org.apache.plc4x.java.base.model.InternalPlcConsumerRegistration;
import org.apache.plc4x.java.base.model.InternalPlcSubscriptionHandle;
import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
@@ -53,7 +52,10 @@ import org.slf4j.LoggerFactory;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
@@ -311,13 +313,13 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
}
@Override
- public PlcSubscriptionRequest.Builder subscriptionRequestBuilder() {
- return new DefaultPlcSubscriptionRequest.Builder(this, new AdsPlcFieldHandler());
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.of(new DefaultPlcSubscriptionRequest.Builder(this, new AdsPlcFieldHandler()));
}
@Override
- public PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder() {
- return new DefaultPlcUnsubscriptionRequest.Builder(this);
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.of(new DefaultPlcUnsubscriptionRequest.Builder(this));
}
@Override
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index ad56e01..6e99861 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -45,7 +45,7 @@ public class ManualPlc4XAdsTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadRequest readRequest = reader.readRequestBuilder().addItem("station", "Allgemein_S2.Station:BYTE").build();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("station", "Allgemein_S2.Station:BYTE").build();
CompletableFuture<PlcReadResponse> response = reader.read(readRequest);
PlcReadResponse readResponse = response.get();
System.out.println("Response " + readResponse);
@@ -54,7 +54,7 @@ public class ManualPlc4XAdsTest {
PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(() -> new RuntimeException("Subscribe not available"));
- PlcSubscriptionRequest subscriptionRequest = plcSubscriber.subscriptionRequestBuilder().addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE").build();
+ PlcSubscriptionRequest subscriptionRequest = plcConnection.subscriptionRequestBuilder().get().addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE").build();
CompletableFuture<PlcSubscriptionResponse> subscribeResponse = plcSubscriber.subscribe(subscriptionRequest);
PlcSubscriptionResponse plcSubscriptionResponse = subscribeResponse.get();
@@ -63,7 +63,7 @@ public class ManualPlc4XAdsTest {
TimeUnit.SECONDS.sleep(5);
plcSubscriber.unregister(plcConsumerRegistration);
- PlcUnsubscriptionRequest unsubscriptionRequest = plcSubscriber.unsubscriptionRequestBuilder().addHandles(plcSubscriptionResponse.getSubscriptionHandles()).build();
+ PlcUnsubscriptionRequest unsubscriptionRequest = plcConnection.unsubscriptionRequestBuilder().get().addHandles(plcSubscriptionResponse.getSubscriptionHandles()).build();
CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionResponse = plcSubscriber.unsubscribe(unsubscriptionRequest);
unsubscriptionResponse
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
index 9b0a7f4..624e607 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
@@ -76,7 +76,7 @@ public class AdsSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "0/0:BYTE").build();
+ PlcReadRequest request = SUT.readRequestBuilder().get().addItem("test", "0/0:BYTE").build();
CompletableFuture<PlcReadResponse> read = SUT.read(request);
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/MockConnection.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/MockConnection.java
index 3c64768..21d19d2 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/MockConnection.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/MockConnection.java
@@ -19,8 +19,12 @@ under the License.
package org.apache.plc4x.java.base.connection;
import io.netty.channel.ChannelHandler;
-import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class MockConnection extends AbstractPlcConnection {
@@ -34,6 +38,26 @@ public class MockConnection extends AbstractPlcConnection {
}
@Override
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
return null;
}
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index ee81291..269b676 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -21,7 +21,10 @@ package org.apache.plc4x.java.ethernetip.connection;
import org.apache.commons.lang3.StringUtils;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.messages.*;
+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.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
import org.apache.plc4x.java.base.messages.*;
@@ -29,6 +32,7 @@ import org.apache.plc4x.java.ethernetip.netty.util.EnipPlcFieldHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public abstract class BaseEtherNetIpPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter {
@@ -56,8 +60,13 @@ public abstract class BaseEtherNetIpPlcConnection extends AbstractPlcConnection
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new EnipPlcFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new EnipPlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new EnipPlcFieldHandler()));
}
@Override
@@ -75,11 +84,6 @@ public abstract class BaseEtherNetIpPlcConnection extends AbstractPlcConnection
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new EnipPlcFieldHandler());
- }
-
- @Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
index e14ac19..3f0ed79 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.plc4x.java.ethernetip.connection;
import io.netty.channel.*;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
import org.apache.plc4x.java.base.connection.ChannelFactory;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
import org.apache.plc4x.java.base.events.ConnectEvent;
@@ -29,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetAddress;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class EtherNetIpTcpPlcConnection extends BaseEtherNetIpPlcConnection {
@@ -53,6 +56,16 @@ public class EtherNetIpTcpPlcConnection extends BaseEtherNetIpPlcConnection {
}
@Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
protected ChannelHandler getChannelHandler(CompletableFuture<Void> sessionSetupCompleteFuture) {
return new ChannelInitializer() {
@Override
diff --git a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
index ba08d13..949eaeb 100644
--- a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
+++ b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
@@ -37,7 +37,7 @@ public class ManualPlc4XEtherNetIpTest {
// Get a reader instance.
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadRequest readRequest = reader.readRequestBuilder()
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get()
.addItem("field", "#4#105#3").build();
// Execute the read operation.
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index 68e38a2..69e99fd 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -21,10 +21,7 @@ package org.apache.plc4x.java.modbus.connection;
import org.apache.commons.lang3.StringUtils;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
-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.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
import org.apache.plc4x.java.base.messages.*;
@@ -32,6 +29,7 @@ import org.apache.plc4x.java.modbus.util.ModbusPlcFieldHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public abstract class BaseModbusPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter {
@@ -59,8 +57,23 @@ public abstract class BaseModbusPlcConnection extends AbstractPlcConnection impl
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new ModbusPlcFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new ModbusPlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new ModbusPlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
}
@Override
@@ -78,11 +91,6 @@ public abstract class BaseModbusPlcConnection extends AbstractPlcConnection impl
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new ModbusPlcFieldHandler());
- }
-
- @Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
index 5e5be0c..8df399e 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
@@ -24,6 +24,8 @@ import com.digitalpetri.modbus.codec.ModbusTcpCodec;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
import org.apache.plc4x.java.base.connection.ChannelFactory;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
import org.apache.plc4x.java.base.protocol.SingleItemToSingleRequestProtocol;
@@ -32,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetAddress;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index 401c872..3f6c786 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -52,7 +52,7 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomRegister", "register:7[3]").build();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomRegister", "register:7[3]").build();
PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
readResponse.getAllByteArrays("randomRegister").stream()
@@ -66,7 +66,7 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomRegister", "register:3[2]").build();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomRegister", "register:3[2]").build();
PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
@@ -90,7 +90,7 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadRequest readRequest = reader.readRequestBuilder()
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get()
.addItem("randomRegister1", "register:1[2]")
.addItem("randomRegister2", "register:10[3]")
.addItem("randomRegister3", "register:20[4]")
@@ -120,7 +120,7 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomCoil", "coil:1[9]").build();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomCoil", "coil:1[9]").build();
PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
readResponse.getAllBooleans("randomCoil").stream()
@@ -131,7 +131,7 @@ public class ManualPlc4XModbusTest {
{
PlcWriter writer = plcConnection.getWriter().orElseThrow(() -> new RuntimeException("No Writer found"));
- PlcWriteRequest writeRequest = writer.writeRequestBuilder().addItem("randomCoilField", "coil:1", true).build();
+ PlcWriteRequest writeRequest = plcConnection.writeRequestBuilder().get().addItem("randomCoilField", "coil:1", true).build();
PlcWriteResponse writeResponse = writer.write(writeRequest).get();
System.out.println("Response " + writeResponse);
}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
index 519d4b9..1179ee0 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
@@ -66,7 +66,7 @@ public class ModbusSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- PlcReadRequest readRequest = SUT.readRequestBuilder().addItem("randomRead", "0/0").build();
+ PlcReadRequest readRequest = SUT.readRequestBuilder().get().addItem("randomRead", "0/0").build();
CompletableFuture<PlcReadResponse> read = SUT.read(readRequest);
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
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 05c815a..090f803 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
@@ -25,10 +25,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-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.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
@@ -51,6 +48,7 @@ import org.slf4j.LoggerFactory;
import java.net.InetAddress;
import java.util.Collections;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -237,8 +235,23 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new S7PlcFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new S7PlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
}
@Override
@@ -256,11 +269,6 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler());
- }
-
- @Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
index 3683f83..100a677 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
@@ -38,7 +38,7 @@ public class PLC4X47Test {
EmbeddedChannel channel = channelFactory.getChannel();*/
S7PlcConnection connection = (S7PlcConnection) new PlcDriverManager().getConnection("s7://10.10.64.20/1/1");
- PlcReadRequest.Builder builder = connection.readRequestBuilder();
+ PlcReadRequest.Builder builder = connection.readRequestBuilder().get();
for (int i = 1; i <= 30; i++) {
// just the first byte of each db
builder.addItem("field-" + i, "%DB3.DB" + i + ":SINT");
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
index 1937676..68b1ba3 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
@@ -20,13 +20,18 @@ package org.apache.plc4x.java.test;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.*;
+import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.base.messages.*;
import org.apache.plc4x.java.base.messages.items.FieldItem;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
/**
@@ -72,8 +77,23 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
}
@Override
- public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(this, new TestFieldHandler());
+ public Optional<PlcReadRequest.Builder> readRequestBuilder() {
+ return Optional.of(new DefaultPlcReadRequest.Builder(this, new TestFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcWriteRequest.Builder> writeRequestBuilder() {
+ return Optional.of(new DefaultPlcWriteRequest.Builder(this, new TestFieldHandler()));
+ }
+
+ @Override
+ public Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder() {
+ return Optional.empty();
}
@Override
@@ -98,11 +118,6 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
}
@Override
- public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(this, new TestFieldHandler());
- }
-
- @Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
if(!(writeRequest instanceof InternalPlcWriteRequest)) {
throw new IllegalArgumentException("Read request doesn't implement InternalPlcWriteRequest");
[incubator-plc4x] 16/19: moved proprietary types to driver-base
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 827b7a1fc927ae875173f69d4bca660abbcfff9a
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Mon Oct 8 12:28:21 2018 +0200
moved proprietary types to driver-base
---
.../java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 2 +-
.../src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java | 2 +-
.../ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java | 4 ++--
.../plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java | 2 +-
.../plc4x/java/base/messages/InternalPlcProprietaryRequest.java | 2 --
.../plc4x/java/base/messages/InternalPlcProprietaryResponse.java | 2 --
.../org/apache/plc4x/java/base}/messages/PlcProprietaryRequest.java | 4 +++-
.../org/apache/plc4x/java/base}/messages/PlcProprietaryResponse.java | 4 +++-
.../org/apache/plc4x/java/base/messages/PlcProprietarySender.java | 3 ---
.../java/org/apache/plc4x/java/base}/messages/PlcProtocolMessage.java | 2 +-
.../main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java | 1 -
.../java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java | 2 --
.../org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java | 1 -
.../java/org/apache/plc4x/java/isotp/netty/model/tpdus/DataTpdu.java | 2 +-
.../main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 2 +-
.../java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java | 2 +-
.../apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java | 2 +-
.../s7/netty/model/messages/SetupCommunicationRequestMessage.java | 2 +-
.../plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java | 2 +-
19 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
index e128bde..fbb359e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java
@@ -35,7 +35,7 @@ import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
-import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
+import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcRequest;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
index 20b865e..a75e033 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRequest.java
@@ -19,7 +19,7 @@
package org.apache.plc4x.java.ads.adslib;
import org.apache.plc4x.java.ads.api.generic.AmsPacket;
-import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
+import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
import org.apache.plc4x.java.base.messages.DefaultPlcProprietaryRequest;
import java.util.concurrent.CompletableFuture;
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
index ed1ccc4..2ed4624 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/adslib/AmsRouter.java
@@ -29,8 +29,8 @@ import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.connection.AdsTcpPlcConnection;
import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
-import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
+import org.apache.plc4x.java.base.messages.PlcProprietaryRequest;
+import org.apache.plc4x.java.base.messages.PlcProprietaryResponse;
import java.io.IOException;
import java.net.*;
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
index 8052624..a1517b3 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java
@@ -33,7 +33,7 @@ import org.apache.plc4x.java.ads.model.DirectAdsField;
import org.apache.plc4x.java.ads.model.SymbolicAdsField;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcFieldRequest;
-import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
+import org.apache.plc4x.java.base.messages.PlcProprietaryResponse;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.base.connection.ChannelFactory;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
index 3e2ed9f..33b5272 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryRequest.java
@@ -18,7 +18,5 @@
*/
package org.apache.plc4x.java.base.messages;
-import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
-
public interface InternalPlcProprietaryRequest<REQUEST> extends PlcProprietaryRequest<REQUEST>, InternalPlcRequest {
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
index 1bbea2f..d42dabf 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/InternalPlcProprietaryResponse.java
@@ -18,7 +18,5 @@
*/
package org.apache.plc4x.java.base.messages;
-import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
-
public interface InternalPlcProprietaryResponse<RESPONSE> extends PlcProprietaryResponse<RESPONSE>, InternalPlcResponse {
}
\ No newline at end of file
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
similarity index 89%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
index a777abf..fdc7558 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryRequest.java
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.api.messages;
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcRequest;
public interface PlcProprietaryRequest<REQUEST> extends PlcRequest {
REQUEST getProprietaryRequest();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
similarity index 89%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
index 3cd64d6..94af885 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietaryResponse.java
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.api.messages;
+package org.apache.plc4x.java.base.messages;
+
+import org.apache.plc4x.java.api.messages.PlcResponse;
public interface PlcProprietaryResponse<T> extends PlcResponse {
T getResponse();
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
index 249146e..8a0ed3d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
@@ -18,9 +18,6 @@
*/
package org.apache.plc4x.java.base.messages;
-import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
-import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
-
import java.util.concurrent.CompletableFuture;
public interface PlcProprietarySender {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProtocolMessage.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
similarity index 94%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProtocolMessage.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
index 4c428d5..cacc6b1 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProtocolMessage.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
@@ -16,7 +16,7 @@ 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;
+package org.apache.plc4x.java.base.messages;
public interface PlcProtocolMessage {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
index 0e0ca3a..b6205d9 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRawMessage.java
@@ -19,7 +19,6 @@ under the License.
package org.apache.plc4x.java.base.messages;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
public class PlcRawMessage implements PlcProtocolMessage {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
index 7e83c7d..f378678 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java
@@ -18,8 +18,6 @@
*/
package org.apache.plc4x.java.base.messages;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
-
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
index 31ac40a..019d018 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.plc4x.java.base.messages;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
import org.apache.plc4x.java.api.messages.PlcRequest;
import org.hamcrest.core.IsEqual;
import org.junit.Before;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/DataTpdu.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/DataTpdu.java
index 49dab91..1134954 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/DataTpdu.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/DataTpdu.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.isotp.netty.model.tpdus;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.isotp.netty.model.params.Parameter;
import org.apache.plc4x.java.isotp.netty.model.types.TpduCode;
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 af5b116..69e8545 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
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.isotp.netty.model.tpdus;
import io.netty.buffer.ByteBuf;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.base.messages.PlcRawMessage;
import org.apache.plc4x.java.isotp.netty.model.params.Parameter;
import org.apache.plc4x.java.isotp.netty.model.types.TpduCode;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
index 75a7df9..c554e44 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7Message.java
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.java.s7.netty.model.messages;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.base.messages.PlcRawMessage;
import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
index 5d03568..1fcd0ef 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/S7RequestMessage.java
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.java.s7.netty.model.messages;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
import org.apache.plc4x.java.s7.netty.model.types.MessageType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
index 244ac87..8194fa8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/messages/SetupCommunicationRequestMessage.java
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.java.s7.netty.model.messages;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.s7.netty.model.params.SetupCommunicationParameter;
import org.apache.plc4x.java.s7.netty.model.types.MessageType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
index 5701953..118143c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
@@ -21,7 +21,7 @@ package org.apache.plc4x.java.s7.netty.strategies;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
-import org.apache.plc4x.java.api.messages.PlcProtocolMessage;
+import org.apache.plc4x.java.base.messages.PlcProtocolMessage;
import org.apache.plc4x.java.s7.netty.model.messages.S7RequestMessage;
import org.apache.plc4x.java.s7.netty.model.messages.S7ResponseMessage;
import org.apache.plc4x.java.s7.netty.model.params.S7Parameter;
[incubator-plc4x] 01/19: added execute() to PlcRequest
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 1ac09c968200a9b8c2fa2e4750dc408fbf9b470b
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 10:28:01 2018 +0200
added execute() to PlcRequest
---
.../org/apache/plc4x/java/api/connection/PlcProprietarySender.java | 2 +-
.../main/java/org/apache/plc4x/java/api/connection/PlcReader.java | 4 ++--
.../main/java/org/apache/plc4x/java/api/connection/PlcWriter.java | 4 ++--
.../java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java | 4 ++++
.../java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java | 6 ++++--
.../org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java | 2 +-
.../java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 5 +++++
.../java/org/apache/plc4x/java/api/messages/PlcReadResponse.java | 5 ++++-
.../main/java/org/apache/plc4x/java/api/messages/PlcRequest.java | 4 +++-
.../main/java/org/apache/plc4x/java/api/messages/PlcResponse.java | 7 ++-----
.../org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java | 4 ++++
.../apache/plc4x/java/api/messages/PlcSubscriptionResponse.java | 5 ++++-
.../apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java | 4 ++++
.../apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java | 5 ++++-
.../java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 4 ++++
.../java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java | 5 ++++-
16 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
index afadad0..926b1bf 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
@@ -25,5 +25,5 @@ import java.util.concurrent.CompletableFuture;
public interface PlcProprietarySender {
- <PROP_REQUEST, PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PlcProprietaryRequest<PROP_REQUEST>, PROP_RESPONSE>> send(PlcProprietaryRequest<PROP_REQUEST> proprietaryRequest);
+ <PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PROP_RESPONSE>> send(PlcProprietaryRequest proprietaryRequest);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index d326409..bdded83 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -35,7 +35,7 @@ public interface PlcReader {
* @param readRequest object describing the type and location of the value.
* @return a {@link CompletableFuture} giving async access to the returned value.
*/
- CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest);
+ CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
/**
* Reads a requested value from a PLC.
@@ -43,7 +43,7 @@ public interface PlcReader {
* @param readRequestBuilderConsumer consumer which can be used to build requests.
* @return a {@link CompletableFuture} giving async access to the returned value.
*/
- default CompletableFuture<PlcReadResponse<?>> read(Consumer<PlcReadRequest.Builder> readRequestBuilderConsumer) {
+ default CompletableFuture<PlcReadResponse> read(Consumer<PlcReadRequest.Builder> readRequestBuilderConsumer) {
PlcReadRequest.Builder requestBuilder = readRequestBuilder();
readRequestBuilderConsumer.accept(requestBuilder);
return read(requestBuilder.build());
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index e974939..ae94859 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -35,7 +35,7 @@ public interface PlcWriter {
* @param writeRequest object describing the type, location and value that whould be written.
* @return a {@link CompletableFuture} giving async access to the response of the write operation.
*/
- CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest);
+ CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
/**
* Writes a given value to a PLC.
@@ -43,7 +43,7 @@ public interface PlcWriter {
* @param writeRequestBuilderConsumer consumer which can be used to build requests.
* @return a {@link CompletableFuture} giving async access to the response of the write operation.
*/
- default CompletableFuture<PlcWriteResponse<?>> write(Consumer<PlcWriteRequest.Builder> writeRequestBuilderConsumer) {
+ default CompletableFuture<PlcWriteResponse> write(Consumer<PlcWriteRequest.Builder> writeRequestBuilderConsumer) {
PlcWriteRequest.Builder requestBuilder = writeRequestBuilder();
writeRequestBuilderConsumer.accept(requestBuilder);
return write(requestBuilder.build());
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
index cff0cb8..85263b7 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldRequest.java
@@ -22,9 +22,13 @@ import org.apache.plc4x.java.api.model.PlcField;
import java.util.LinkedHashSet;
import java.util.LinkedList;
+import java.util.concurrent.CompletableFuture;
public interface PlcFieldRequest extends PlcRequest {
+ @Override
+ CompletableFuture<? extends PlcFieldResponse> execute();
+
int getNumberOfFields();
LinkedHashSet<String> getFieldNames();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
index 768eb58..cf2be49 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcFieldResponse.java
@@ -26,9 +26,11 @@ import java.util.Collection;
/**
* Base type for all response messages sent as response for a prior request
* from a plc to the plc4x system.
- * @param <REQUEST_TYPE> the type of the matching request.
*/
-public interface PlcFieldResponse<REQUEST_TYPE extends PlcFieldRequest> extends PlcResponse<REQUEST_TYPE> {
+public interface PlcFieldResponse extends PlcResponse {
+
+ @Override
+ PlcFieldRequest getRequest();
Collection<String> getFieldNames();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
index 2e3bf58..9c03dba 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
@@ -18,6 +18,6 @@
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcProprietaryResponse<REQUEST extends PlcProprietaryRequest, RESPONSE> extends PlcResponse<REQUEST> {
+public interface PlcProprietaryResponse<RESPONSE> extends PlcResponse {
RESPONSE getResponse();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
index 2b9a7d5..62f97ba 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
@@ -18,11 +18,16 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
+import java.util.concurrent.CompletableFuture;
+
/**
* Request to read one or more values from a plc.
*/
public interface PlcReadRequest extends PlcFieldRequest {
+ @Override
+ CompletableFuture<? extends PlcReadResponse> execute();
+
interface Builder extends PlcMessageBuilder<PlcReadRequest> {
Builder addItem(String name, String fieldQuery);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
index bf5900b..e160b16 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
@@ -28,7 +28,10 @@ import java.util.Collection;
/**
* Response to a {@link PlcReadRequest}.
*/
-public interface PlcReadResponse<T extends PlcReadRequest> extends PlcFieldResponse<T> {
+public interface PlcReadResponse extends PlcFieldResponse {
+
+ @Override
+ PlcReadRequest getRequest();
int getNumberOfValues(String name);
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
index f2367f9..4b40bf1 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
@@ -18,9 +18,11 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
+import java.util.concurrent.CompletableFuture;
+
/**
* Base type for all messages sent from the plc4x system to a connected plc.
*/
public interface PlcRequest extends PlcMessage {
-
+ CompletableFuture<? extends PlcResponse> execute();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
index 0781762..7fdcffc 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcResponse.java
@@ -21,10 +21,7 @@ package org.apache.plc4x.java.api.messages;
/**
* Base type for all response messages sent as response for a prior request
* from a plc to the plc4x system.
- * @param <REQUEST_TYPE> the type of the matching request.
*/
-public interface PlcResponse<REQUEST_TYPE extends PlcRequest> extends PlcMessage {
-
- REQUEST_TYPE getRequest();
-
+public interface PlcResponse extends PlcMessage {
+ PlcRequest getRequest();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
index 19cd66e..917f3da 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
@@ -19,9 +19,13 @@ under the License.
package org.apache.plc4x.java.api.messages;
import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
public interface PlcSubscriptionRequest extends PlcFieldRequest {
+ @Override
+ CompletableFuture<? extends PlcSubscriptionResponse> execute();
+
interface Builder extends PlcMessageBuilder<PlcSubscriptionRequest> {
/**
* Adds a new field to the to be constructed request which should be polled cyclically.
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
index 57d71c5..30b802a 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponse.java
@@ -22,7 +22,10 @@ import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import java.util.Collection;
-public interface PlcSubscriptionResponse extends PlcFieldResponse<PlcSubscriptionRequest> {
+public interface PlcSubscriptionResponse extends PlcFieldResponse {
+
+ @Override
+ PlcSubscriptionRequest getRequest();
PlcSubscriptionHandle getSubscriptionHandle(String name);
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
index ac7b66a..995675f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
@@ -21,9 +21,13 @@ package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
public interface PlcUnsubscriptionRequest extends PlcFieldRequest {
+ @Override
+ CompletableFuture<? extends PlcUnsubscriptionResponse> execute();
+
interface Builder extends PlcMessageBuilder<PlcUnsubscriptionRequest> {
/**
* TODO document me:
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
index 9764f8d..94b9174 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponse.java
@@ -18,7 +18,10 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcUnsubscriptionResponse extends PlcFieldResponse<PlcUnsubscriptionRequest> {
+public interface PlcUnsubscriptionResponse extends PlcFieldResponse {
+
+ @Override
+ PlcUnsubscriptionRequest getRequest();
interface Builder extends PlcMessageBuilder<PlcUnsubscriptionResponse> {
/**
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index 69ac6bf..36c430e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -23,9 +23,13 @@ import java.math.BigInteger;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.util.concurrent.CompletableFuture;
public interface PlcWriteRequest extends PlcFieldRequest {
+ @Override
+ CompletableFuture<? extends PlcWriteResponse> execute();
+
int getNumberOfValues(String name);
interface Builder extends PlcMessageBuilder<PlcWriteRequest> {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
index 3bfa79c..035a3d7 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
@@ -18,6 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcWriteResponse<T extends PlcWriteRequest> extends PlcFieldResponse<T> {
+public interface PlcWriteResponse extends PlcFieldResponse {
+
+ @Override
+ PlcWriteRequest getRequest();
}
[incubator-plc4x] 19/19: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/execute-operation
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 006226026f55d023ed99306551fab01f1b7f4ff2
Merge: 48dbad0 2e7ccc1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 17 18:29:43 2018 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/execute-operation
plc4j/protocols/delta-v/pom.xml | 72 +
.../java/org/apache/plc4x/java/deltav/PoC.java | 968 ------------
.../java/org/apache/plc4x/java/deltav/PoCES.java | 1617 +++++++++++++++++++
.../org/apache/plc4x/java/deltav/PoCInflux.java | 1584 +++++++++++++++++++
.../base/messages/items/DefaultLongFieldItem.java | 2 +-
.../messages/items/DefaultLongFieldItemTest.java | 114 ++
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 2 +-
pom.xml | 3 +
src/site/asciidoc/protocols/delta-v/read-data.adoc | 1655 ++++++++++++++++++++
.../protocols/delta-v/reverse-engineering.adoc | 7 +
10 files changed, 5054 insertions(+), 970 deletions(-)
[incubator-plc4x] 12/19: moved driver to spi package
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit ec663469068ce0977e807571a1e2423dc640703b
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 16:01:33 2018 +0200
moved driver to spi package
---
.../java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java | 2 +-
.../org/apache/plc4x/java/examples/dummydriver/DummyDriver.java | 4 ++--
.../java/examples/dummydriver/connection/DummyConnection.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java | 2 +-
.../org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java | 2 +-
.../src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java | 2 +-
.../main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java | 3 +--
.../src/main/java/org/apache/plc4x/camel/Plc4XProducer.java | 2 +-
.../src/test/java/org/apache/plc4x/camel/MockDriver.java | 6 +++---
.../src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java | 4 +---
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java | 2 +-
.../test/java/org/apache/plc4x/edgent/mock/MockConnection.java | 4 ++--
.../src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 2 +-
.../src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java | 2 +-
.../src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java | 2 +-
.../src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 2 +-
.../src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java | 2 +-
.../org/apache/plc4x/java/api/{connection => }/PlcConnection.java | 2 +-
.../main/java/org/apache/plc4x/java/{api => spi}/PlcDriver.java | 4 ++--
.../plc4x/java/{api/connection => spi}/PlcProprietarySender.java | 2 +-
.../org/apache/plc4x/java/{api/connection => spi}/PlcReader.java | 2 +-
.../apache/plc4x/java/{api/connection => spi}/PlcSubscriber.java | 2 +-
.../org/apache/plc4x/java/{api/connection => spi}/PlcWriter.java | 2 +-
.../src/main/java/org/apache/plc4x/java/PlcDriverManager.java | 4 ++--
.../test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java | 4 ++--
.../core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java | 4 ++--
.../plc4x/java/ads/connection/AdsAbstractPlcConnection.java | 6 +++---
.../org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java | 2 +-
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 6 +-----
.../apache/plc4x/java/base/connection/AbstractPlcConnection.java | 2 +-
.../apache/plc4x/java/base/messages/DefaultPlcReadRequest.java | 2 +-
.../plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java | 2 +-
.../plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java | 2 +-
.../apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java | 2 +-
.../java/base/protocol/SingleItemToSingleRequestProtocol.java | 4 ++--
.../java/base/protocol/SingleItemToSingleRequestProtocolTest.java | 6 +++---
.../org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 4 ++--
.../java/ethernetip/connection/BaseEtherNetIpPlcConnection.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java | 2 +-
.../main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java | 4 ++--
.../plc4x/java/modbus/connection/BaseModbusPlcConnection.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java | 2 +-
.../s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 ++--
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
.../s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java | 7 -------
.../src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java | 8 --------
.../src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java | 6 ------
.../src/site/asciidoc/developers/implementing-drivers.adoc | 4 ++--
.../src/main/java/org/apache/plc4x/java/test/TestConnection.java | 6 +++---
.../src/main/java/org/apache/plc4x/java/test/TestPlcDriver.java | 4 ++--
...c4x.java.api.PlcDriver => org.apache.plc4x.java.spi.PlcDriver} | 0
62 files changed, 75 insertions(+), 103 deletions(-)
diff --git a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
index 45ac6c6..a9994be 100644
--- a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
+++ b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
@@ -22,7 +22,7 @@ import com.microsoft.azure.sdk.iot.device.DeviceClient;
import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
import com.microsoft.azure.sdk.iot.device.Message;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.slf4j.Logger;
diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
index c8ab21a..d9e182b 100644
--- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
+++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.examples.dummydriver;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.examples.dummydriver.connection.DummyConnection;
diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
index 8fc73b4..947971f 100644
--- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
+++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.examples.dummydriver.connection;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
diff --git a/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
index c6aac9b..0bb8b0e 100644
--- a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
+++ b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
@@ -22,7 +22,7 @@ import io.jsonwebtoken.JwtBuilder;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.eclipse.paho.client.mqttv3.*;
diff --git a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index 05190e9..f8928dc 100644
--- a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.examples.helloplc4x;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.types.PlcResponseCode;
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
index e2f983c..23dd0eb 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorConverterHelper;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.*;
import org.slf4j.Logger;
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
index 3e90b44..ef2af6e 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
@@ -24,8 +24,7 @@ import org.apache.camel.PollingConsumer;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
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 f43e603..b737a63 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
@@ -22,7 +22,7 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultAsyncProducer;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
index 2be45b2..fe0c6d2 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
@@ -18,10 +18,10 @@ under the License.
*/
package org.apache.plc4x.camel;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
index 0068a11..f51a43d 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
@@ -21,9 +21,7 @@ package org.apache.plc4x.camel;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.junit.Before;
import org.junit.Test;
diff --git a/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index e3e23cc..a52cd34 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -23,7 +23,7 @@ import org.apache.edgent.function.Consumer;
import org.apache.edgent.function.Function;
import org.apache.edgent.function.Supplier;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index f6de8d4..fdc8df6 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.edgent.mock;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
index d5c574b..887ce2e 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.edgent.mock;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
public class MockDriver implements PlcDriver {
diff --git a/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
index 7459ac5..4c0429a 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
@@ -23,7 +23,7 @@ import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.sink.SinkRecord;
import org.apache.kafka.connect.sink.SinkTask;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.kafka.util.VersionUtil;
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 7a2b21b..2bbc56b 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -26,7 +26,7 @@ import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.SourceRecord;
import org.apache.kafka.connect.source.SourceTask;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
index 1f8cb85..080354a 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/BasePlc4xProcessor.java
@@ -27,7 +27,7 @@ import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import java.util.*;
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
index a72ea23..d743e57 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
@@ -28,7 +28,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
index 7254e90..09fabff 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
@@ -27,7 +27,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.json.simple.JSONObject;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
similarity index 98%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
index a6da03d..c1a78c5 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcConnection.java
@@ -16,7 +16,7 @@ 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.connection;
+package org.apache.plc4x.java.api;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcDriver.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcDriver.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
index c2d45fb..bc6b974 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/PlcDriver.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
@@ -16,10 +16,10 @@ 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;
+package org.apache.plc4x.java.spi;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
/**
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java
similarity index 95%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java
index 80db408..204a2b6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.api.connection;
+package org.apache.plc4x.java.spi;
import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java
index 133868d..4febbb7 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java
@@ -16,7 +16,7 @@ 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.connection;
+package org.apache.plc4x.java.spi;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java
similarity index 98%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java
index 4a3f6cc..89fc0aa 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.api.connection;
+package org.apache.plc4x.java.spi;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java
index db52de6..b8e11bb 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java
@@ -16,7 +16,7 @@ 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.connection;
+package org.apache.plc4x.java.spi;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/plc4j/core/src/main/java/org/apache/plc4x/java/PlcDriverManager.java b/plc4j/core/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
index 8539a61..3b50927 100644
--- a/plc4j/core/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
+++ b/plc4j/core/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import java.net.URI;
diff --git a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java
index 3c5e3d5..05250ab 100644
--- a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java
+++ b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.mock;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
public class DoubleMockDriver implements PlcDriver {
diff --git a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
index 6d47d0f..4771550 100644
--- a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
+++ b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.mock;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
public class MockDriver implements PlcDriver {
diff --git a/plc4j/core/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/core/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/core/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/core/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/core/src/test/resources/test/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/core/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/core/src/test/resources/test/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/core/src/test/resources/test/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
index 2a208ad..1ce7666 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java
@@ -22,9 +22,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.plc4x.java.ads.api.generic.types.AmsNetId;
import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.connection.AdsConnectionFactory;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import java.net.InetAddress;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index de0e75d..aa8e471 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -31,9 +31,9 @@ import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
import org.apache.plc4x.java.ads.model.DirectAdsField;
import org.apache.plc4x.java.ads.model.SymbolicAdsField;
-import org.apache.plc4x.java.api.connection.PlcProprietarySender;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcProprietarySender;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.*;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 4d582e7..3736e8c 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -32,7 +32,7 @@ import org.apache.plc4x.java.ads.model.*;
import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
import org.apache.plc4x.java.ads.protocol.Payload2TcpProtocol;
import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
diff --git a/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/protocols/ads/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index 283663a..491f606 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -19,15 +19,11 @@
package org.apache.plc4x.java.ads;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
public class ManualPlc4XAdsTest {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
index 28be93f..42989d6 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
@@ -22,7 +22,7 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.util.HashedWheelTimer;
import io.netty.util.Timer;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
index d835bc0..c37833e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.PlcReader;
+import org.apache.plc4x.java.spi.PlcReader;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
index 35bf369..9ae9992 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
index 45300a5..d868d07 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
@@ -19,7 +19,7 @@
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
+import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index d475b83..710b17a 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -21,7 +21,7 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 3b13a88..91d914e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -25,8 +25,8 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.PromiseCombiner;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.exceptions.PlcTimeoutException;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
index c97d2a6..2133370 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
@@ -25,9 +25,9 @@ import io.netty.channel.PendingWriteQueue;
import io.netty.util.HashedWheelTimer;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcSubscriber;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcFieldRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcResponseCode;
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
index 69aa03a..47a487b 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.ethernetip;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.ethernetip.connection.EtherNetIpTcpPlcConnection;
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index 269b676..34dac5d 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.ethernetip.connection;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
diff --git a/plc4j/protocols/ethernetip/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/ethernetip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/protocols/ethernetip/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/protocols/ethernetip/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
index 95cc511..27d7f39 100644
--- a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
+++ b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
@@ -19,7 +19,7 @@
package org.apache.plc4x.java.ethernetip;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
index 0aad72e..30d9091 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
@@ -19,9 +19,9 @@ under the License.
package org.apache.plc4x.java.modbus;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.modbus.connection.ModbusConnectionFactory;
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index 69e99fd..15dfea3 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.modbus.connection;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
diff --git a/plc4j/protocols/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/protocols/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/protocols/modbus/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index 910942a..ded2ea3 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.modbus;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
index 1d6b576..839ed30 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.s7;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.s7.connection.S7PlcConnection;
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 090f803..ab46f3e 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
@@ -22,8 +22,8 @@ import io.netty.channel.*;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.SystemConfiguration;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
diff --git a/plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
index bb7e369..c7ddebd 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
@@ -18,17 +18,10 @@ under the License.
*/
package org.apache.plc4x.java.s7;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Optional;
-
public class S7PlcScanner {
private static final Logger logger = LoggerFactory.getLogger(S7PlcScanner.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 06648b7..f33f563 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
@@ -18,14 +18,6 @@ under the License.
*/
package org.apache.plc4x.java.s7;
-import java.util.List;
-import java.util.Optional;
-import java.util.Scanner;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.model.PlcField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
index 67a0d53..48318ed 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
@@ -18,15 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.s7;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.model.PlcField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Optional;
-
public class S7PlcWriterSample {
private static final Logger logger = LoggerFactory.getLogger(S7PlcWriterSample.class);
diff --git a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
index 99af2a1..5c62a03 100644
--- a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
+++ b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
@@ -171,14 +171,14 @@ It allows to manually send and receive (binary) data to and from a pipeline for
== Implementing a custom driver
PLC4X's `DriverManager` finds it's drivers, by using the default `Java ServiceLoader`.
-This requires a file called `org.apache.plc4x.java.api.PlcDriver` in the `META-INF/services` directory of the drivers JAR file.
+This requires a file called `org.apache.plc4x.java.spi.PlcDriver` in the `META-INF/services` directory of the drivers JAR file.
For each type of driver provided inside this JAR, one line has to be added to this file containing the fully qualified class name of the driver implementation.
For the S7 driver for example all it contains is this line:
org.apache.plc4x.java.s7.S7PlcDriver
-A driver implementation must implement the `org.apache.plc4x.java.api.PlcDriver` interface.
+A driver implementation must implement the `org.apache.plc4x.java.spi.PlcDriver` interface.
This defines the necessary methods for the `DriverManager` to find the correct implementation and create a new connection instance.
The important methods here are:
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
index 4c5764b..c4a3ab6 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
@@ -20,9 +20,9 @@ package org.apache.plc4x.java.test;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.spi.PlcReader;
+import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.base.messages.*;
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestPlcDriver.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestPlcDriver.java
index d4f2138..d5cec02 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestPlcDriver.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestPlcDriver.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.test;
-import org.apache.plc4x.java.api.PlcDriver;
+import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.connection.PlcConnection;
+import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
/**
diff --git a/plc4j/protocols/test/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver b/plc4j/protocols/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from plc4j/protocols/test/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
rename to plc4j/protocols/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
[incubator-plc4x] 06/19: implemented new api for s7 and test
protocols
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit c66b83e3afd00c8417c5cf867e5e97b2418d1dec
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:53:47 2018 +0200
implemented new api for s7 and test protocols
---
.../org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 8 ++++----
.../java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java | 2 +-
.../main/java/org/apache/plc4x/java/test/TestConnection.java | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
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 7318198..05c815a 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
@@ -238,11 +238,11 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new S7PlcFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new S7PlcFieldHandler());
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
@@ -257,11 +257,11 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new S7PlcFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new S7PlcFieldHandler());
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
index d1c9e8d..3683f83 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/issues/PLC4X47Test.java
@@ -44,7 +44,7 @@ public class PLC4X47Test {
builder.addItem("field-" + i, "%DB3.DB" + i + ":SINT");
}
PlcReadRequest readRequest = builder.build();
- PlcReadResponse<?> readResponse = connection.read(readRequest).get();
+ PlcReadResponse readResponse = connection.read(readRequest).get();
System.out.println(readResponse.getFieldNames().size());
}
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
index 911e05a..1937676 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
@@ -73,11 +73,11 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new TestFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new TestFieldHandler());
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
if(!(readRequest instanceof InternalPlcReadRequest)) {
throw new IllegalArgumentException("Read request doesn't implement InternalPlcReadRequest");
}
@@ -93,17 +93,17 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
: new ImmutablePair<>(PlcResponseCode.NOT_FOUND, null);
fields.put(fieldName, fieldPair);
}
- PlcReadResponse<?> response = new DefaultPlcReadResponse(request, fields);
+ PlcReadResponse response = new DefaultPlcReadResponse(request, fields);
return CompletableFuture.completedFuture(response);
}
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new TestFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new TestFieldHandler());
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
if(!(writeRequest instanceof InternalPlcWriteRequest)) {
throw new IllegalArgumentException("Read request doesn't implement InternalPlcWriteRequest");
}
@@ -115,7 +115,7 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
device.set(field, fieldItem);
fields.put(fieldName, PlcResponseCode.OK);
}
- PlcWriteResponse<?> response = new DefaultPlcWriteResponse(request, fields);
+ PlcWriteResponse response = new DefaultPlcWriteResponse(request, fields);
return CompletableFuture.completedFuture(response);
}
[incubator-plc4x] 08/19: fixed examples to use the new api
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 7375d040917b2de0391611d3aef8c4316b625950
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 12:03:28 2018 +0200
fixed examples to use the new api
---
.../plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java | 2 +-
.../plc4x/java/examples/dummydriver/connection/DummyConnection.java | 4 ++--
.../java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java | 2 +-
.../java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java | 6 +++---
.../org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
index 728e502..7bb03ec 100644
--- a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
+++ b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
@@ -70,7 +70,7 @@ public class S7PlcToAzureIoTHubSample {
while (!Thread.currentThread().isInterrupted()) {
// Simulate telemetry.
- PlcReadResponse<?> response = plcReader.read(request).get();
+ PlcReadResponse response = plcReader.read(request).get();
response.getAllLongs(FIELD_NAME)
.forEach(longValue -> {
String result = Long.toBinaryString(longValue);
diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
index c448873..4b7c00a 100644
--- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
+++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
@@ -64,7 +64,7 @@ public class DummyConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
CompletableFuture<InternalPlcReadResponse> readFuture = new CompletableFuture<>();
PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, readFuture);
@@ -80,7 +80,7 @@ public class DummyConnection extends AbstractPlcConnection implements PlcReader,
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> writeFuture = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, writeFuture);
diff --git a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
index 48b2d6a..29d25a3 100644
--- a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
+++ b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
@@ -239,7 +239,7 @@ public class S7PlcToGoogleIoTCoreSample {
while (!Thread.currentThread().isInterrupted()) {
- PlcReadResponse<?> plcReadResponse = plcReader.read(readRequest).get();
+ PlcReadResponse plcReadResponse = plcReader.read(readRequest).get();
// Refresh the connection credentials before the JWT expires.
// [START iot_mqtt_jwt_refresh]
diff --git a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index e078434..d149ba5 100644
--- a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -68,7 +68,7 @@ public class HelloPlc4x {
// NOTICE: the ".get()" immediately lets this thread pause till
// the response is processed and available.
System.out.println("\nSynchronous request ...");
- PlcReadResponse<?> syncResponse = plcReader.read(plcReadRequest).get();
+ PlcReadResponse syncResponse = plcReader.read(plcReadRequest).get();
// Simply iterating over the field names returned in the response.
printResponse(syncResponse);
@@ -76,7 +76,7 @@ public class HelloPlc4x {
// Read asynchronously ...
// Register a callback executed as soon as a response arives.
System.out.println("\n\nAsynchronous request ...");
- CompletableFuture<PlcReadResponse<?>> asyncResponse = plcReader.read(plcReadRequest);
+ CompletableFuture<PlcReadResponse> asyncResponse = plcReader.read(plcReadRequest);
asyncResponse.whenComplete((readResponse, throwable) -> {
if (readResponse != null) {
printResponse(syncResponse);
@@ -94,7 +94,7 @@ public class HelloPlc4x {
}
}
- private static void printResponse(PlcReadResponse<?> syncResponse) {
+ private static void printResponse(PlcReadResponse syncResponse) {
for (String fieldName : syncResponse.getFieldNames()) {
if(syncResponse.getResponseCode(fieldName) == PlcResponseCode.OK) {
int numValues = syncResponse.getNumberOfValues(fieldName);
diff --git a/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java b/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
index 730fad4..b822aac 100644
--- a/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
+++ b/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
@@ -86,10 +86,10 @@ public class KafkaBridge {
PlcReadRequest readRequest = builder.build();
// Create a supplier that is able to read the batch we just created.
- Supplier<PlcReadResponse<?>> plcSupplier = PlcFunctions.batchSupplier(plcAdapter, readRequest);
+ Supplier<PlcReadResponse> plcSupplier = PlcFunctions.batchSupplier(plcAdapter, readRequest);
// Start polling our plc source in the given interval.
- TStream<PlcReadResponse<?>> source = top.poll(plcSupplier, config.getPollingInterval(), TimeUnit.MILLISECONDS);
+ TStream<PlcReadResponse> source = top.poll(plcSupplier, config.getPollingInterval(), TimeUnit.MILLISECONDS);
// Convert the byte into a string.
TStream<String> jsonSource = source.map(value -> {
[incubator-plc4x] 04/19: implemented new api for ethernet/ip
protocol
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 7bde8987af79241b5ef57915e713b51787478286
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:33:14 2018 +0200
implemented new api for ethernet/ip protocol
---
.../java/ethernetip/connection/BaseEtherNetIpPlcConnection.java | 8 ++++----
.../apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index 4aa7a47..ee81291 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -57,11 +57,11 @@ public abstract class BaseEtherNetIpPlcConnection extends AbstractPlcConnection
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new EnipPlcFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new EnipPlcFieldHandler());
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
@@ -76,11 +76,11 @@ public abstract class BaseEtherNetIpPlcConnection extends AbstractPlcConnection
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new EnipPlcFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new EnipPlcFieldHandler());
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
diff --git a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
index 8750d5e..ba08d13 100644
--- a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
+++ b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
@@ -41,8 +41,8 @@ public class ManualPlc4XEtherNetIpTest {
.addItem("field", "#4#105#3").build();
// Execute the read operation.
- CompletableFuture<PlcReadResponse<?>> response = reader.read(readRequest);
- PlcReadResponse<?> readResponse = response.get();
+ CompletableFuture<PlcReadResponse> response = reader.read(readRequest);
+ PlcReadResponse readResponse = response.get();
// Output the response.
for (String fieldName : readResponse.getFieldNames()) {
[incubator-plc4x] 17/19: removed type parameter from request builder
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit ccddc20a890fbad840ff6eaa2043461a26b7116c
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Mon Oct 8 12:38:22 2018 +0200
removed type parameter from request builder
---
.../java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 7 ++++++-
.../java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java | 6 ++----
.../org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java | 6 +++++-
.../apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java | 6 +++++-
.../java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 5 ++++-
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
index 6f9376e..e60afc3 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
@@ -28,8 +28,13 @@ public interface PlcReadRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcReadResponse> execute();
- interface Builder extends PlcRequestBuilder<PlcReadRequest> {
+ interface Builder extends PlcRequestBuilder {
+
+ @Override
+ PlcReadRequest build();
+
Builder addItem(String name, String fieldQuery);
+
}
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
index 98ff6af..b5f9b80 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java
@@ -18,8 +18,6 @@ under the License.
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcRequestBuilder<T extends PlcRequest> {
-
- T build();
-
+public interface PlcRequestBuilder {
+ PlcRequest build();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
index 5eeac08..3e51d6f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequest.java
@@ -26,7 +26,11 @@ public interface PlcSubscriptionRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcSubscriptionResponse> execute();
- interface Builder extends PlcRequestBuilder<PlcSubscriptionRequest> {
+ interface Builder extends PlcRequestBuilder {
+
+ @Override
+ PlcSubscriptionRequest build();
+
/**
* Adds a new field to the to be constructed request which should be polled cyclically.
*
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
index 7eebec9..8b95f44 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
@@ -28,7 +28,11 @@ public interface PlcUnsubscriptionRequest extends PlcFieldRequest {
@Override
CompletableFuture<? extends PlcUnsubscriptionResponse> execute();
- interface Builder extends PlcRequestBuilder<PlcUnsubscriptionRequest> {
+ interface Builder extends PlcRequestBuilder {
+
+ @Override
+ PlcUnsubscriptionRequest build();
+
/**
* TODO document me:
*
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index ea8a767..95de458 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -32,7 +32,10 @@ public interface PlcWriteRequest extends PlcFieldRequest {
int getNumberOfValues(String name);
- interface Builder extends PlcRequestBuilder<PlcWriteRequest> {
+ interface Builder extends PlcRequestBuilder {
+
+ @Override
+ PlcWriteRequest build();
PlcWriteRequest.Builder addItem(String name, String fieldQuery, Boolean... values);
[incubator-plc4x] 05/19: implemented new api for modbus protocol
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 996b74e6f52d1502d461d63be2e4d082324736d4
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:47:12 2018 +0200
implemented new api for modbus protocol
---
.../plc4x/java/modbus/connection/BaseModbusPlcConnection.java | 8 ++++----
.../plc4x/java/modbus/connection/ModbusTcpPlcConnection.java | 2 +-
.../org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java | 10 +++++-----
.../java/modbus/connection/BaseModbusPlcConnectionTest.java | 4 ++--
.../java/modbus/connection/ModbusSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +++---
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index a9db2af..68e38a2 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -60,11 +60,11 @@ public abstract class BaseModbusPlcConnection extends AbstractPlcConnection impl
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new ModbusPlcFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new ModbusPlcFieldHandler());
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
CompletableFuture<InternalPlcReadResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcReadRequest, InternalPlcReadResponse> container =
new PlcRequestContainer<>((InternalPlcReadRequest) readRequest, future);
@@ -79,11 +79,11 @@ public abstract class BaseModbusPlcConnection extends AbstractPlcConnection impl
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new ModbusPlcFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new ModbusPlcFieldHandler());
}
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
CompletableFuture<InternalPlcWriteResponse> future = new CompletableFuture<>();
PlcRequestContainer<InternalPlcWriteRequest, InternalPlcWriteResponse> container =
new PlcRequestContainer<>((InternalPlcWriteRequest) writeRequest, future);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
index 1bcdb67..5e5be0c 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/ModbusTcpPlcConnection.java
@@ -69,7 +69,7 @@ public class ModbusTcpPlcConnection extends BaseModbusPlcConnection {
protected void initChannel(Channel channel) {
channel.pipeline().addLast(new ModbusTcpCodec(new ModbusRequestEncoder(), new ModbusResponseDecoder()));
channel.pipeline().addLast(new Plc4XModbusProtocol());
- channel.pipeline().addLast(new SingleItemToSingleRequestProtocol(timer));
+ channel.pipeline().addLast(new SingleItemToSingleRequestProtocol(ModbusTcpPlcConnection.this, ModbusTcpPlcConnection.this, timer));
}
};
}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index bfa1f2c..370840d 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -50,7 +50,7 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadResponse<?> readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:7[3]")).get();
+ PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:7[3]")).get();
System.out.println("Response " + readResponse);
readResponse.getAllByteArrays("randomRegister").stream()
.map(HexUtil::toHex)
@@ -63,7 +63,7 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadResponse<?> readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:3[2]")).get();
+ PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:3[2]")).get();
System.out.println("Response " + readResponse);
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
randomRegisters.stream()
@@ -86,7 +86,7 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadResponse<?> readResponse = reader.read(builder -> builder
+ PlcReadResponse readResponse = reader.read(builder -> builder
.addItem("randomRegister1", "register:1[2]")
.addItem("randomRegister2", "register:10[3]")
.addItem("randomRegister3", "register:20[4]")
@@ -115,7 +115,7 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadResponse<?> readResponse = reader.read(builder -> builder.addItem("randomCoil", "coil:1[9]")).get();
+ PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomCoil", "coil:1[9]")).get();
System.out.println("Response " + readResponse);
readResponse.getAllBooleans("randomCoil").stream()
.map(hex -> "Coil Value: " + hex)
@@ -125,7 +125,7 @@ public class ManualPlc4XModbusTest {
{
PlcWriter writer = plcConnection.getWriter().orElseThrow(() -> new RuntimeException("No Writer found"));
- PlcWriteResponse<?> writeResponse = writer.write(builder -> builder.addItem("randomCoilField", "coil:1", true)).get();
+ PlcWriteResponse writeResponse = writer.write(builder -> builder.addItem("randomCoilField", "coil:1", true)).get();
System.out.println("Response " + writeResponse);
}
} catch (Exception e) {
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
index 62f94cb..8a4c419 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnectionTest.java
@@ -90,7 +90,7 @@ public class BaseModbusPlcConnectionTest {
@Test
public void read() {
- CompletableFuture<PlcReadResponse<?>> read = SUT.read(mock(InternalPlcReadRequest.class));
+ CompletableFuture<PlcReadResponse> read = SUT.read(mock(InternalPlcReadRequest.class));
assertNotNull(read);
simulatePipelineError(() -> SUT.read(mock(InternalPlcReadRequest.class)));
@@ -98,7 +98,7 @@ public class BaseModbusPlcConnectionTest {
@Test
public void write() {
- CompletableFuture<PlcWriteResponse<?>> write = SUT.write(mock(InternalPlcWriteRequest.class));
+ CompletableFuture<PlcWriteResponse> write = SUT.write(mock(InternalPlcWriteRequest.class));
assertNotNull(write);
simulatePipelineError(() -> SUT.write(mock(InternalPlcWriteRequest.class)));
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
index b0d1478..68c2183 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
@@ -65,7 +65,7 @@ public class ModbusSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- CompletableFuture<PlcReadResponse<?>> read = SUT.read(builder -> builder.addItem("randomRead", "0/0"));
+ CompletableFuture<PlcReadResponse> read = SUT.read(builder -> builder.addItem("randomRead", "0/0"));
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
index b67f97a..3a40f12 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java
@@ -124,7 +124,7 @@ public class Plc4XModbusProtocolTest {
private static ImmutablePair<PlcRequestContainer<InternalPlcReadRequest, InternalPlcResponse>, ModbusTcpPayload> producePair(Class type, String field, ModbusPdu modbusPdu) {
return ImmutablePair.of(
new PlcRequestContainer<>(
- (InternalPlcReadRequest) new DefaultPlcReadRequest.Builder(new ModbusPlcFieldHandler())
+ (InternalPlcReadRequest) new DefaultPlcReadRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
.addItem(RandomStringUtils.randomAlphabetic(10), field)
.build(), new CompletableFuture<>()),
new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
@@ -139,7 +139,7 @@ public class Plc4XModbusProtocolTest {
if (values.length == 1) {
return ImmutablePair.of(
new PlcRequestContainer<>(
- (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(new ModbusPlcFieldHandler())
+ (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
.addItem(RandomStringUtils.randomAlphabetic(10), field, values[0])
.build(), new CompletableFuture<>()),
new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
@@ -147,7 +147,7 @@ public class Plc4XModbusProtocolTest {
} else {
return ImmutablePair.of(
new PlcRequestContainer<>(
- (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(new ModbusPlcFieldHandler())
+ (InternalPlcWriteRequest) new DefaultPlcWriteRequest.Builder(null, new ModbusPlcFieldHandler()) // TODO: remove null
.addItem(RandomStringUtils.randomAlphabetic(10), field, values)
.build(), new CompletableFuture<>()),
new ModbusTcpPayload((short) 0, (short) 0, modbusPdu)
[incubator-plc4x] 15/19: fixed documentation
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 08437d2d26e3eb691c4befcc2bfe2a5750377d5c
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Fri Oct 5 14:33:15 2018 +0200
fixed documentation
---
plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
index fae9c88..6247f17 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcDriver.java
@@ -25,7 +25,7 @@ import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
/**
* General interface defining the minimal methods required for adding a new type of driver to the PLC4J system.
*
- * <b>Note that each driver has to add a service file called org.apache.plc4x.java.PlcDriver to
+ * <b>Note that each driver has to add a service file called org.apache.plc4x.java.spi.PlcDriver to
* src/main/resources/META-INF which contains the fully qualified classname in order to get loaded
* by the PlcDriverManager instances.</b>
*/
[incubator-plc4x] 09/19: removed default methods from the api
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 8da0bc27e1db6fae82612d65e44b738df9d740be
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 12:38:14 2018 +0200
removed default methods from the api
---
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 13 ++---
.../plc4x/java/api/connection/PlcConnection.java | 12 +++++
.../java/api/connection/PlcProprietarySender.java | 2 +-
.../plc4x/java/api/connection/PlcReader.java | 12 -----
.../plc4x/java/api/connection/PlcSubscriber.java | 59 ----------------------
.../plc4x/java/api/connection/PlcWriter.java | 12 -----
.../java/api/messages/PlcProprietaryResponse.java | 4 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 7 +--
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 13 ++---
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 19 ++++---
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
12 files changed, 52 insertions(+), 109 deletions(-)
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
index 42544f5..7887f02 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
@@ -26,10 +26,8 @@ import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,14 +86,17 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
// TODO: Is it correct to only support one field?
PlcSubscriptionRequest request = plcSubscriber.subscriptionRequestBuilder()
.addCyclicField("default", fieldQuery, Duration.of(3, ChronoUnit.SECONDS)).build();
- plcSubscriber.register(request, this);
+ PlcSubscriptionResponse plcSubscriptionResponse = plcSubscriber.subscribe(request).get();
+ // TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
+ plcSubscriber.register(this, plcSubscriptionResponse.getSubscriptionHandles());
}
@Override
protected void doStop() throws InterruptedException, ExecutionException, TimeoutException, PlcException {
PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(
() -> new PlcException("Connection doesn't support subscriptions."));
- CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionFuture = plcSubscriber.unsubscribe(builder -> builder.addHandles(subscriptionResponse.getSubscriptionHandles()));
+ PlcUnsubscriptionRequest request = plcSubscriber.unsubscriptionRequestBuilder().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
+ CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionFuture = plcSubscriber.unsubscribe(request);
PlcUnsubscriptionResponse unsubscriptionResponse = unsubscriptionFuture.get(5, TimeUnit.SECONDS);
// TODO: Handle the response ...
try {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
index c508217..4c2b197 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
@@ -19,6 +19,10 @@ under the License.
package org.apache.plc4x.java.api.connection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import java.util.Optional;
@@ -53,6 +57,14 @@ public interface PlcConnection extends AutoCloseable {
@Override
void close() throws Exception;
+ /*Optional<PlcReadRequest.Builder> readRequestBuilder();
+
+ Optional<PlcWriteRequest.Builder> writeRequestBuilder();
+
+ Optional<PlcSubscriptionRequest.Builder> subscriptionRequestBuilder();
+
+ Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder();*/
+
Optional<PlcReader> getReader();
Optional<PlcWriter> getWriter();
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
index 926b1bf..2a053cb 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcProprietarySender.java
@@ -25,5 +25,5 @@ import java.util.concurrent.CompletableFuture;
public interface PlcProprietarySender {
- <PROP_RESPONSE> CompletableFuture<PlcProprietaryResponse<PROP_RESPONSE>> send(PlcProprietaryRequest proprietaryRequest);
+ <T> CompletableFuture<PlcProprietaryResponse<T>> send(PlcProprietaryRequest proprietaryRequest);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index bdded83..b78d306 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -37,18 +37,6 @@ public interface PlcReader {
*/
CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
- /**
- * Reads a requested value from a PLC.
- *
- * @param readRequestBuilderConsumer consumer which can be used to build requests.
- * @return a {@link CompletableFuture} giving async access to the returned value.
- */
- default CompletableFuture<PlcReadResponse> read(Consumer<PlcReadRequest.Builder> readRequestBuilderConsumer) {
- PlcReadRequest.Builder requestBuilder = readRequestBuilder();
- readRequestBuilderConsumer.accept(requestBuilder);
- return read(requestBuilder.build());
- }
-
PlcReadRequest.Builder readRequestBuilder();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
index 0581bd6..1f582cb 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
@@ -42,18 +42,6 @@ public interface PlcSubscriber {
CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest);
/**
- * Subscribes to fields on the PLC.
- *
- * @param plcSubscriptionRequestBuilderConsumer consumer which can be used to build requests.
- * @return subscription response containing a subscription response item for each subscription request item.
- */
- default CompletableFuture<PlcSubscriptionResponse> subscribe(Consumer<PlcSubscriptionRequest.Builder> plcSubscriptionRequestBuilderConsumer) {
- PlcSubscriptionRequest.Builder builder = subscriptionRequestBuilder();
- plcSubscriptionRequestBuilderConsumer.accept(builder);
- return subscribe(builder.build());
- }
-
- /**
* Unsubscribes from fields on the PLC. For unsubscribing the unsubscription request uses the subscription
* handle returned as part of the subscription response item.
*
@@ -63,59 +51,12 @@ public interface PlcSubscriber {
CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest);
/**
- * Unsubscribes from fields on the PLC. For unsubscribing the unsubscription request uses the subscription
- * handle returned as part of the subscription response item.
- *
- * @param plcSubscriptionRequestBuilderConsumer consumer which can be used to build requests.
- * @return unsubscription response containing a unsubscription response item for each unsubscription request item.
- */
- default CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(Consumer<PlcUnsubscriptionRequest.Builder> plcSubscriptionRequestBuilderConsumer) {
- PlcUnsubscriptionRequest.Builder builder = unsubscriptionRequestBuilder();
- plcSubscriptionRequestBuilderConsumer.accept(builder);
- return unsubscribe(builder.build());
- }
-
- /**
- * Convenience method to subscribe a {@link Consumer} to all fields of the subscription.
- *
- * @param subscriptionRequest subscription request
- * @param consumer consumer for all {@link PlcSubscriptionEvent}s
- * @return TODO: document me
- * @throws ExecutionException something went wrong.
- * @throws InterruptedException something went wrong.
- */
- default PlcConsumerRegistration register(PlcSubscriptionRequest subscriptionRequest, Consumer<PlcSubscriptionEvent> consumer) throws ExecutionException, InterruptedException {
- PlcSubscriptionResponse plcSubscriptionResponse = subscribe(subscriptionRequest).get();
- // TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
- return register(consumer, plcSubscriptionResponse.getSubscriptionHandles().toArray(new PlcSubscriptionHandle[0]));
- }
-
- /**
- * Convenience method to subscribe a {@link Consumer} to all fields of the subscription.
- *
- * @param subscriptionRequestBuilderConsumer consumer for building subscription request.
- * @param consumer consumer for all {@link PlcSubscriptionEvent}s
- * @return TODO: document me
- * @throws ExecutionException something went wrong.
- * @throws InterruptedException something went wrong.
- */
- default PlcConsumerRegistration register(Consumer<PlcSubscriptionRequest.Builder> subscriptionRequestBuilderConsumer, Consumer<PlcSubscriptionEvent> consumer) throws ExecutionException, InterruptedException {
- PlcSubscriptionRequest.Builder builder = subscriptionRequestBuilder();
- subscriptionRequestBuilderConsumer.accept(builder);
- return register(builder.build(), consumer);
- }
-
- /**
* @param consumer
* @param handles
* @return TODO: document me
*/
PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles);
- default PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, PlcSubscriptionHandle... handles) {
- return register(consumer, Arrays.asList(handles));
- }
-
/**
* // TODO: document me.
*/
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index ae94859..b22977f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -37,18 +37,6 @@ public interface PlcWriter {
*/
CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
- /**
- * Writes a given value to a PLC.
- *
- * @param writeRequestBuilderConsumer consumer which can be used to build requests.
- * @return a {@link CompletableFuture} giving async access to the response of the write operation.
- */
- default CompletableFuture<PlcWriteResponse> write(Consumer<PlcWriteRequest.Builder> writeRequestBuilderConsumer) {
- PlcWriteRequest.Builder requestBuilder = writeRequestBuilder();
- writeRequestBuilderConsumer.accept(requestBuilder);
- return write(requestBuilder.build());
- }
-
PlcWriteRequest.Builder writeRequestBuilder();
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
index 9c03dba..3cd64d6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
@@ -18,6 +18,6 @@
*/
package org.apache.plc4x.java.api.messages;
-public interface PlcProprietaryResponse<RESPONSE> extends PlcResponse {
- RESPONSE getResponse();
+public interface PlcProprietaryResponse<T> extends PlcResponse {
+ T getResponse();
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 8433526..d88dee7 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -260,10 +260,11 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
@Override
public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
- return register(consumer, handles.toArray(new PlcSubscriptionHandle[0]));
+ return register(consumer, handles);
}
- @Override
+ // TODO: figure out what this is
+ /*@Override
public InternalPlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, PlcSubscriptionHandle... handles) {
Objects.requireNonNull(consumer);
Objects.requireNonNull(handles);
@@ -297,7 +298,7 @@ public class AdsTcpPlcConnection extends AdsAbstractPlcConnection implements Plc
getChannel().pipeline().get(Plc4x2AdsProtocol.class).addConsumer(adsDeviceNotificationRequestConsumer);
return internalPlcConsumerRegistration;
- }
+ }*/
@Override
public void unregister(PlcConsumerRegistration plcConsumerRegistration) {
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index bca72a5..ad56e01 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -22,9 +22,7 @@ import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcSubscriber;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
import java.util.Collection;
@@ -47,7 +45,8 @@ public class ManualPlc4XAdsTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- CompletableFuture<PlcReadResponse> response = reader.read(builder -> builder.addItem("station", "Allgemein_S2.Station:BYTE"));
+ PlcReadRequest readRequest = reader.readRequestBuilder().addItem("station", "Allgemein_S2.Station:BYTE").build();
+ CompletableFuture<PlcReadResponse> response = reader.read(readRequest);
PlcReadResponse readResponse = response.get();
System.out.println("Response " + readResponse);
Collection<Integer> stations = readResponse.getAllIntegers("station");
@@ -55,7 +54,8 @@ public class ManualPlc4XAdsTest {
PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(() -> new RuntimeException("Subscribe not available"));
- CompletableFuture<PlcSubscriptionResponse> subscribeResponse = plcSubscriber.subscribe(builder -> builder.addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE"));
+ PlcSubscriptionRequest subscriptionRequest = plcSubscriber.subscriptionRequestBuilder().addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE").build();
+ CompletableFuture<PlcSubscriptionResponse> subscribeResponse = plcSubscriber.subscribe(subscriptionRequest);
PlcSubscriptionResponse plcSubscriptionResponse = subscribeResponse.get();
PlcConsumerRegistration plcConsumerRegistration = plcSubscriber.register(System.out::println, plcSubscriptionResponse.getSubscriptionHandles());
@@ -63,7 +63,8 @@ public class ManualPlc4XAdsTest {
TimeUnit.SECONDS.sleep(5);
plcSubscriber.unregister(plcConsumerRegistration);
- CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionResponse = plcSubscriber.unsubscribe(builder -> builder.addHandles(plcSubscriptionResponse.getSubscriptionHandles()));
+ PlcUnsubscriptionRequest unsubscriptionRequest = plcSubscriber.unsubscriptionRequestBuilder().addHandles(plcSubscriptionResponse.getSubscriptionHandles()).build();
+ CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionResponse = plcSubscriber.unsubscribe(unsubscriptionRequest);
unsubscriptionResponse
.get(5, TimeUnit.SECONDS);
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
index 9988da3..9b0a7f4 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsSerialPlcConnectionTest.java
@@ -28,6 +28,7 @@ import org.apache.plc4x.java.ads.api.generic.types.AmsPort;
import org.apache.plc4x.java.ads.api.serial.AmsSerialAcknowledgeFrame;
import org.apache.plc4x.java.ads.api.serial.AmsSerialFrame;
import org.apache.plc4x.java.ads.api.serial.types.*;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.SerialChannelFactory;
@@ -75,7 +76,8 @@ public class AdsSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- CompletableFuture<PlcReadResponse> read = SUT.read(builder -> builder.addItem("test", "0/0:BYTE"));
+ PlcReadRequest request = SUT.readRequestBuilder().addItem("test", "0/0:BYTE").build();
+ CompletableFuture<PlcReadResponse> read = SUT.read(request);
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
}
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index 370840d..401c872 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -23,7 +23,9 @@ import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
+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.base.util.HexUtil;
@@ -50,7 +52,8 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:7[3]")).get();
+ PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomRegister", "register:7[3]").build();
+ PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
readResponse.getAllByteArrays("randomRegister").stream()
.map(HexUtil::toHex)
@@ -63,7 +66,8 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomRegister", "register:3[2]")).get();
+ PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomRegister", "register:3[2]").build();
+ PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
randomRegisters.stream()
@@ -86,13 +90,14 @@ public class ManualPlc4XModbusTest {
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadResponse readResponse = reader.read(builder -> builder
+ PlcReadRequest readRequest = reader.readRequestBuilder()
.addItem("randomRegister1", "register:1[2]")
.addItem("randomRegister2", "register:10[3]")
.addItem("randomRegister3", "register:20[4]")
.addItem("randomRegister4", "register:30[5]")
.addItem("randomRegister5", "register:40[6]")
- ).get();
+ .build();
+ PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
IntStream.range(1, 6).forEach(i -> {
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister" + i);
@@ -115,7 +120,8 @@ public class ManualPlc4XModbusTest {
{
PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
- PlcReadResponse readResponse = reader.read(builder -> builder.addItem("randomCoil", "coil:1[9]")).get();
+ PlcReadRequest readRequest = reader.readRequestBuilder().addItem("randomCoil", "coil:1[9]").build();
+ PlcReadResponse readResponse = reader.read(readRequest).get();
System.out.println("Response " + readResponse);
readResponse.getAllBooleans("randomCoil").stream()
.map(hex -> "Coil Value: " + hex)
@@ -125,7 +131,8 @@ public class ManualPlc4XModbusTest {
{
PlcWriter writer = plcConnection.getWriter().orElseThrow(() -> new RuntimeException("No Writer found"));
- PlcWriteResponse writeResponse = writer.write(builder -> builder.addItem("randomCoilField", "coil:1", true)).get();
+ PlcWriteRequest writeRequest = writer.writeRequestBuilder().addItem("randomCoilField", "coil:1", true).build();
+ PlcWriteResponse writeResponse = writer.write(writeRequest).get();
System.out.println("Response " + writeResponse);
}
} catch (Exception e) {
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
index 68c2183..519d4b9 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/connection/ModbusSerialPlcConnectionTest.java
@@ -24,6 +24,7 @@ import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.channel.jsc.JSerialCommDeviceAddress;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.SerialChannelFactory;
@@ -65,7 +66,8 @@ public class ModbusSerialPlcConnectionTest {
@Test
public void testRead() throws Exception {
prepareSerialSimulator();
- CompletableFuture<PlcReadResponse> read = SUT.read(builder -> builder.addItem("randomRead", "0/0"));
+ PlcReadRequest readRequest = SUT.readRequestBuilder().addItem("randomRead", "0/0").build();
+ CompletableFuture<PlcReadResponse> read = SUT.read(readRequest);
PlcReadResponse plcReadResponse = read.get(30, TimeUnit.SECONDS);
assertNotNull(plcReadResponse);
}
[incubator-plc4x] 14/19: moved reader, writer,
subscriber to driver-base module
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 554c3033bd9b87f7eacb7f696bac1379ae439884
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 19:37:11 2018 +0200
moved reader,writer,subscriber to driver-base module
---
.../plc4x/java/examples/dummydriver/connection/DummyConnection.java | 4 ++--
.../src/test/java/org/apache/plc4x/camel/MockDriver.java | 2 +-
.../src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java | 4 ++--
.../apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java | 6 +++---
.../org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java | 2 +-
.../org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java | 1 -
.../plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java | 1 -
.../plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java | 1 -
.../org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java | 1 -
.../org/apache/plc4x/java/base/messages}/PlcProprietarySender.java | 2 +-
.../main/java/org/apache/plc4x/java/base/messages}/PlcReader.java | 2 +-
.../java/org/apache/plc4x/java/base/messages}/PlcSubscriber.java | 2 +-
.../main/java/org/apache/plc4x/java/base/messages}/PlcWriter.java | 2 +-
.../plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java | 4 ++--
.../java/base/protocol/SingleItemToSingleRequestProtocolTest.java | 6 +++---
.../java/ethernetip/connection/BaseEtherNetIpPlcConnection.java | 4 ++--
.../plc4x/java/modbus/connection/BaseModbusPlcConnection.java | 4 ++--
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 4 ++--
.../src/main/java/org/apache/plc4x/java/test/TestConnection.java | 4 ++--
19 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
index 947971f..c5721ca 100644
--- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
+++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.examples.dummydriver.connection;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory;
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
index fe0c6d2..a34f93d 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
@@ -21,7 +21,7 @@ package org.apache.plc4x.camel;
import org.apache.plc4x.java.spi.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.spi.PlcSubscriber;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index fdc8df6..383d3c6 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.edgent.mock;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
index aa8e471..5ac73ef 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java
@@ -31,9 +31,9 @@ import org.apache.plc4x.java.ads.api.generic.types.Invoke;
import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler;
import org.apache.plc4x.java.ads.model.DirectAdsField;
import org.apache.plc4x.java.ads.model.SymbolicAdsField;
-import org.apache.plc4x.java.spi.PlcProprietarySender;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcProprietarySender;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.*;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
index 3736e8c..406557f 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java
@@ -32,7 +32,7 @@ import org.apache.plc4x.java.ads.model.*;
import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol;
import org.apache.plc4x.java.ads.protocol.Payload2TcpProtocol;
import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol;
-import org.apache.plc4x.java.spi.PlcSubscriber;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
index c37833e..b08fd85 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java
@@ -19,7 +19,6 @@ under the License.
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.spi.PlcReader;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
index 9ae9992..815b46e 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java
@@ -20,7 +20,6 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
index d868d07..3e13d57 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java
@@ -19,7 +19,6 @@
package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.spi.PlcSubscriber;
import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index 710b17a..6330300 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -21,7 +21,6 @@ package org.apache.plc4x.java.base.messages;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.spi.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
index 204a2b6..249146e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.spi;
+package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcProprietaryRequest;
import org.apache.plc4x.java.api.messages.PlcProprietaryResponse;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
index 4febbb7..c403ca1 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.spi;
+package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
similarity index 98%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
index 89fc0aa..577a774 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.spi;
+package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
index b8e11bb..13a83f4 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.spi;
+package org.apache.plc4x.java.base.messages;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 91d914e..bc19ad2 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -25,8 +25,8 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.PromiseCombiner;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.exceptions.PlcTimeoutException;
import org.apache.plc4x.java.api.model.PlcField;
diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
index 2133370..5a9ac98 100644
--- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
+++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
@@ -25,9 +25,9 @@ import io.netty.channel.PendingWriteQueue;
import io.netty.util.HashedWheelTimer;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcSubscriber;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcSubscriber;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcFieldRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcResponseCode;
diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index 34dac5d..80dd054 100644
--- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.ethernetip.connection;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
index 15dfea3..2f983e7 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.modbus.connection;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
import org.apache.plc4x.java.base.connection.ChannelFactory;
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 ab46f3e..037beea 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
@@ -22,8 +22,8 @@ import io.netty.channel.*;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.SystemConfiguration;
import org.apache.commons.lang3.StringUtils;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.connection.AbstractPlcConnection;
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
index c4a3ab6..32da5e9 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.test;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.spi.PlcReader;
-import org.apache.plc4x.java.spi.PlcWriter;
+import org.apache.plc4x.java.base.messages.PlcReader;
+import org.apache.plc4x.java.base.messages.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.base.messages.*;
[incubator-plc4x] 07/19: fixed integrations to use the new api
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 361432c63b4d94701ea52ddd4a1cf8632a28c4db
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 11:59:54 2018 +0200
fixed integrations to use the new api
---
.../java/org/apache/plc4x/edgent/PlcConnectionAdapter.java | 4 ++--
.../src/main/java/org/apache/plc4x/edgent/PlcFunctions.java | 2 +-
.../org/apache/plc4x/edgent/PlcConnectionAdapterTest.java | 4 ++--
.../java/org/apache/plc4x/edgent/mock/MockConnection.java | 12 ++++++------
.../main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java | 6 +++---
.../main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 2 +-
.../java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index 2a34560..9ce5d92 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -108,8 +108,8 @@ public class PlcConnectionAdapter implements AutoCloseable {
() -> new PlcException("This connection doesn't support reading")).readRequestBuilder();
}
- Supplier<PlcReadResponse<?>> newSupplier(PlcReadRequest readRequest) {
- return new Supplier<PlcReadResponse<?>>() {
+ Supplier<PlcReadResponse> newSupplier(PlcReadRequest readRequest) {
+ return new Supplier<PlcReadResponse>() {
private static final long serialVersionUID = 1L;
@Override
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
index 942dbc3..ab00c82 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
@@ -144,7 +144,7 @@ public class PlcFunctions {
return adapter.newSupplier(LocalDateTime.class, PlcClientDatatype.DATE_TIME, addressStr);
}
- public static Supplier<PlcReadResponse<?>> batchSupplier(PlcConnectionAdapter adapter, PlcReadRequest readRequest) {
+ public static Supplier<PlcReadResponse> batchSupplier(PlcConnectionAdapter adapter, PlcReadRequest readRequest) {
return adapter.newSupplier(readRequest);
}
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
index bb9c2af..06ac34e 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
@@ -90,7 +90,7 @@ public class PlcConnectionAdapterTest {
// TODO: smart value conversion
connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
- CompletableFuture<PlcReadResponse<?>> cf = connection.read(request);
+ CompletableFuture<PlcReadResponse> cf = connection.read(request);
assertThat(cf.isDone(), is(true));
PlcReadResponse response = cf.get();
@@ -105,7 +105,7 @@ public class PlcConnectionAdapterTest {
PlcField plcField = request.getFields().get(0);
connection.setFieldItem(plcField, new DefaultLongFieldItem(0L));
- CompletableFuture<PlcWriteResponse<?>> cf = connection.write(request);
+ CompletableFuture<PlcWriteResponse> cf = connection.write(request);
assertThat(cf.isDone(), is(true));
PlcWriteResponse response = cf.get();
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index 54754cd..e569e1e 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -68,15 +68,15 @@ public class MockConnection extends org.apache.plc4x.java.base.connection.MockCo
@Override
public PlcReadRequest.Builder readRequestBuilder() {
- return new DefaultPlcReadRequest.Builder(new MockFieldHandler());
+ return new DefaultPlcReadRequest.Builder(this, new MockFieldHandler());
}
@Override
- public CompletableFuture<PlcReadResponse<?>> read(PlcReadRequest readRequest) {
+ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
curReadCnt++;
if (readExceptionTriggerCount > 0 && curReadCnt == readExceptionTriggerCount) {
curReadCnt = 0;
- CompletableFuture<PlcReadResponse<?>> cf = new CompletableFuture<>();
+ CompletableFuture<PlcReadResponse> cf = new CompletableFuture<>();
cf.completeExceptionally(new PlcIoException(readExceptionMsg));
return cf;
}
@@ -91,17 +91,17 @@ public class MockConnection extends org.apache.plc4x.java.base.connection.MockCo
@Override
public PlcWriteRequest.Builder writeRequestBuilder() {
- return new DefaultPlcWriteRequest.Builder(new MockFieldHandler());
+ return new DefaultPlcWriteRequest.Builder(this, new MockFieldHandler());
}
@SuppressWarnings("unchecked")
@Override
- public CompletableFuture<PlcWriteResponse<?>> write(PlcWriteRequest writeRequest) {
+ public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
DefaultPlcWriteRequest defaultPlcWriteRequest = (DefaultPlcWriteRequest) writeRequest;
curWriteCnt++;
if (writeExceptionTriggerCount > 0 && curWriteCnt == writeExceptionTriggerCount) {
curWriteCnt = 0;
- CompletableFuture<PlcWriteResponse<?>> cf = new CompletableFuture<>();
+ CompletableFuture<PlcWriteResponse> cf = new CompletableFuture<>();
cf.completeExceptionally(new PlcIoException(writeExceptionMsg));
return cf;
}
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 7c048c5..62fbb12 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -154,9 +154,9 @@ public class Plc4xSourceTask extends SourceTask {
}
private List<SourceRecord> doFetch() throws InterruptedException {
- final CompletableFuture<PlcReadResponse<?>> response = plcReader.read(plcRequest);
+ final CompletableFuture<PlcReadResponse> response = plcReader.read(plcRequest);
try {
- final PlcReadResponse<?> received = response.get(TIMEOUT_LIMIT_MILLIS, TimeUnit.MILLISECONDS);
+ final PlcReadResponse received = response.get(TIMEOUT_LIMIT_MILLIS, TimeUnit.MILLISECONDS);
return extractValues(received);
} catch (ExecutionException e) {
throw new ConnectException("Could not fetch data from source", e);
@@ -165,7 +165,7 @@ public class Plc4xSourceTask extends SourceTask {
}
}
- private List<SourceRecord> extractValues(PlcReadResponse<?> response) {
+ private List<SourceRecord> extractValues(PlcReadResponse response) {
final List<SourceRecord> result = new LinkedList<>();
for (String query : queries) {
final PlcResponseCode rc = response.getResponseCode(query);
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
index 4c8721b..ab7b0a0 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
@@ -65,7 +65,7 @@ public class Plc4xSinkProcessor extends BasePlc4xProcessor {
PlcWriteRequest writeRequest = builder.build();
// Send the request to the PLC.
- CompletableFuture<PlcWriteResponse<?>> future = writer.write(writeRequest);
+ CompletableFuture<PlcWriteResponse> future = writer.write(writeRequest);
future.whenComplete((response, throwable) -> {
if (throwable != null) {
session.transfer(session.create(), FAILURE);
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
index d7a3b73..f3dbb59 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
@@ -61,7 +61,7 @@ public class Plc4xSourceProcessor extends BasePlc4xProcessor {
FlowFile flowFile = session.create();
session.append(flowFile, out -> {
try {
- PlcReadResponse<?> response = reader.read(readRequest).get();
+ PlcReadResponse response = reader.read(readRequest).get();
JSONObject obj = new JSONObject();
for (String fieldName : response.getFieldNames()) {
for(int i = 0; i < response.getNumberOfValues(fieldName); i++) {
[incubator-plc4x] 11/19: adjusted connectors and examples to the
new api
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit eb079f92a09404df93545c436cc2ff5d71353918
Author: Andrey Skorikov <an...@codecentric.de>
AuthorDate: Thu Oct 4 15:54:51 2018 +0200
adjusted connectors and examples to the new api
---
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 5 +---
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 5 +---
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 22 +++++++-------
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 17 +++--------
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 14 +++++----
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 4 +--
.../java/org/apache/plc4x/camel/MockDriver.java | 11 ++-----
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 3 --
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 14 ++-------
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 9 +++---
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 23 +++++++--------
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 8 ++---
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 24 +++++++--------
.../plc4x/java/api/connection/PlcConnection.java | 8 -----
.../plc4x/java/api/connection/PlcReader.java | 2 --
.../plc4x/java/api/connection/PlcSubscriber.java | 4 ---
.../plc4x/java/api/connection/PlcWriter.java | 2 --
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 13 ++++-----
.../base/connection/AbstractPlcConnection.java | 28 ------------------
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 8 ++---
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 34 +++++++++-------------
.../org/apache/plc4x/java/test/TestConnection.java | 16 ----------
22 files changed, 83 insertions(+), 191 deletions(-)
diff --git a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
index a4f80cc..45ac6c6 100644
--- a/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
+++ b/examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
@@ -23,7 +23,6 @@ import com.microsoft.azure.sdk.iot.device.IotHubClientProtocol;
import com.microsoft.azure.sdk.iot.device.Message;
import org.apache.plc4x.java.PlcDriverManager;
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.slf4j.Logger;
@@ -62,15 +61,13 @@ public class S7PlcToAzureIoTHubSample {
DeviceClient client = new DeviceClient(iotConnectionString, IotHubClientProtocol.MQTT);
client.open();
- // Get a reader instance.
- PlcReader plcReader = plcConnection.getReader().orElseThrow(IllegalStateException::new);
// Prepare a read request.
PlcReadRequest request = plcConnection.readRequestBuilder().get().addItem(FIELD_NAME, addressString).build();
while (!Thread.currentThread().isInterrupted()) {
// Simulate telemetry.
- PlcReadResponse response = plcReader.read(request).get();
+ PlcReadResponse response = request.execute().get();
response.getAllLongs(FIELD_NAME)
.forEach(longValue -> {
String result = Long.toBinaryString(longValue);
diff --git a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
index fba969c..c6aac9b 100644
--- a/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
+++ b/examples/google/src/main/java/org/apache/plc4x/java/examples/google/iotcore/S7PlcToGoogleIoTCoreSample.java
@@ -23,7 +23,6 @@ import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.apache.plc4x.java.PlcDriverManager;
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.eclipse.paho.client.mqttv3.*;
@@ -233,13 +232,11 @@ public class S7PlcToGoogleIoTCoreSample {
try (PlcConnection plcConnection = new PlcDriverManager().getConnection("s7://10.10.64.20/1/1")) {
logger.info("Connected");
- PlcReader plcReader = plcConnection.getReader().orElseThrow(IllegalAccessError::new);
-
PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("outputs", "OUTPUTS/0").build();
while (!Thread.currentThread().isInterrupted()) {
- PlcReadResponse plcReadResponse = plcReader.read(readRequest).get();
+ PlcReadResponse plcReadResponse = readRequest.execute().get();
// Refresh the connection credentials before the JWT expires.
// [START iot_mqtt_jwt_refresh]
diff --git a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index 402c856..05190e9 100644
--- a/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -20,14 +20,12 @@ package org.apache.plc4x.java.examples.helloplc4x;
import org.apache.plc4x.java.PlcDriverManager;
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.types.PlcResponseCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class HelloPlc4x {
@@ -49,34 +47,36 @@ public class HelloPlc4x {
// Establish a connection to the plc using the url provided as first argument
try (PlcConnection plcConnection = new PlcDriverManager().getConnection(args[0])) {
- Optional<PlcReader> reader = plcConnection.getReader();
-
// Check if this connection support reading of data.
- if (reader.isPresent()) {
- PlcReader plcReader = reader.get();
+ if (plcConnection.readRequestBuilder().isPresent()) {
// Create a new read request:
// - Give the single item requested the alias name "value"
- PlcReadRequest.Builder builder = plcConnection.readRequestBuilder().get();
+ PlcReadRequest.Builder syncBuilder = plcConnection.readRequestBuilder().get();
for (int i = 1; i < args.length; i++) {
- builder.addItem("value-" + i, args[i]);
+ syncBuilder.addItem("value-" + i, args[i]);
}
- PlcReadRequest plcReadRequest = builder.build();
+ PlcReadRequest syncPlcReadRequest = syncBuilder.build();
//////////////////////////////////////////////////////////
// Read synchronously ...
// NOTICE: the ".get()" immediately lets this thread pause till
// the response is processed and available.
System.out.println("\nSynchronous request ...");
- PlcReadResponse syncResponse = plcReader.read(plcReadRequest).get();
+ PlcReadResponse syncResponse = syncPlcReadRequest.execute().get();
// Simply iterating over the field names returned in the response.
printResponse(syncResponse);
//////////////////////////////////////////////////////////
// Read asynchronously ...
// Register a callback executed as soon as a response arives.
+ PlcReadRequest.Builder asyncBuilder = plcConnection.readRequestBuilder().get();
+ for (int i = 1; i < args.length; i++) {
+ asyncBuilder.addItem("value-" + i, args[i]);
+ }
+ PlcReadRequest asyncPlcReadRequest = asyncBuilder.build();
System.out.println("\n\nAsynchronous request ...");
- CompletableFuture<PlcReadResponse> asyncResponse = plcReader.read(plcReadRequest);
+ CompletableFuture<? extends PlcReadResponse> asyncResponse = asyncPlcReadRequest.execute();
asyncResponse.whenComplete((readResponse, throwable) -> {
if (readResponse != null) {
printResponse(syncResponse);
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
index 9ec281c..e2f983c 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XConsumer.java
@@ -24,7 +24,6 @@ import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.*;
import org.slf4j.Logger;
@@ -49,7 +48,6 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
private Class<?> dataType;
private PlcSubscriptionResponse subscriptionResponse;
-
public Plc4XConsumer(Plc4XEndpoint endpoint, Processor processor) throws PlcException {
this.endpoint = endpoint;
this.dataType = endpoint.getDataType();
@@ -80,22 +78,19 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
@Override
protected void doStart() throws InterruptedException, ExecutionException, PlcException {
- PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(
- () -> new PlcException("Connection doesn't support subscriptions."));
// TODO: Is it correct to only support one field?
PlcSubscriptionRequest request = plcConnection.subscriptionRequestBuilder().get()
.addCyclicField("default", fieldQuery, Duration.of(3, ChronoUnit.SECONDS)).build();
- PlcSubscriptionResponse plcSubscriptionResponse = plcSubscriber.subscribe(request).get();
+ subscriptionResponse = request.execute().get();
// TODO: we need to return the plcSubscriptionResponse here too as we need this to unsubscribe...
- plcSubscriber.register(this, plcSubscriptionResponse.getSubscriptionHandles());
+ // TODO: figure out what to do with this
+ // plcSubscriber.register(this, plcSubscriptionResponse.getSubscriptionHandles());
}
@Override
protected void doStop() throws InterruptedException, ExecutionException, TimeoutException, PlcException {
- PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(
- () -> new PlcException("Connection doesn't support subscriptions."));
PlcUnsubscriptionRequest request = plcConnection.unsubscriptionRequestBuilder().get().addHandles(subscriptionResponse.getSubscriptionHandles()).build();
- CompletableFuture<PlcUnsubscriptionResponse> unsubscriptionFuture = plcSubscriber.unsubscribe(request);
+ CompletableFuture<? extends PlcUnsubscriptionResponse> unsubscriptionFuture = request.execute();
PlcUnsubscriptionResponse unsubscriptionResponse = unsubscriptionFuture.get(5, TimeUnit.SECONDS);
// TODO: Handle the response ...
try {
@@ -105,10 +100,6 @@ public class Plc4XConsumer extends ServiceSupport implements Consumer, java.util
}
}
- private PlcSubscriber getSubscriber() {
- return plcConnection.getSubscriber().orElseThrow(() -> new RuntimeException("No subscriber available"));
- }
-
@Override
public void accept(PlcSubscriptionEvent plcSubscriptionEvent) {
LOGGER.debug("Received {}", plcSubscriptionEvent);
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
index 4aee7ad..3e90b44 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
@@ -44,8 +44,7 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
private Plc4XEndpoint endpoint;
private ExceptionHandler exceptionHandler;
private PlcConnection plcConnection;
- private PlcReader plcReader;
- private PlcReadRequest readRequest;
+ private PlcReadRequest.Builder requestBuilder;
private Class dataType;
public Plc4XPollingConsumer(Plc4XEndpoint endpoint) throws PlcException {
@@ -54,8 +53,7 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
String plc4xURI = endpoint.getEndpointUri().replaceFirst("plc4x:/?/?", "");
this.plcConnection = endpoint.getPlcDriverManager().getConnection(plc4xURI);
- this.plcReader = plcConnection.getReader().orElseThrow(() -> new PlcException("This connection doesn't support reading."));
- readRequest = plcConnection.readRequestBuilder().get().addItem("default", endpoint.getAddress()).build();
+ this.requestBuilder = plcConnection.readRequestBuilder().orElseThrow(() -> new PlcException("This connection doesn't support reading."));
}
@Override
@@ -79,7 +77,7 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
@Override
public Exchange receive() {
Exchange exchange = endpoint.createExchange();
- CompletableFuture<? extends PlcReadResponse> read = plcReader.read(readRequest);
+ CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
try {
PlcReadResponse plcReadResponse = read.get();
exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
@@ -97,7 +95,7 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
@Override
public Exchange receive(long timeout) {
Exchange exchange = endpoint.createExchange();
- CompletableFuture<? extends PlcReadResponse> read = plcReader.read(readRequest);
+ CompletableFuture<? extends PlcReadResponse> read = createReadRequest().execute();
try {
PlcReadResponse plcReadResponse = read.get(timeout, TimeUnit.MILLISECONDS);
exchange.getIn().setBody(unwrapIfSingle(plcReadResponse.getAllObjects("default")));
@@ -121,6 +119,10 @@ public class Plc4XPollingConsumer extends ServiceSupport implements PollingConsu
}
}
+ private PlcReadRequest createReadRequest() {
+ return requestBuilder.addItem("default", endpoint.getAddress()).build();
+ }
+
private Object unwrapIfSingle(Collection collection) {
if (collection.isEmpty()) {
return null;
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 b4adbcc..f43e603 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
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultAsyncProducer;
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.PlcWriteResponse;
@@ -60,9 +59,8 @@ public class Plc4XProducer extends DefaultAsyncProducer {
Object value = in.getBody(Object.class);
// builder.addItem(fieldName, fieldQuery, value);
}
- PlcWriter plcWriter = plcConnection.getWriter().orElseThrow(() -> new IllegalArgumentException("Writer for driver not found"));
PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder().orElseThrow(() -> new IllegalArgumentException("Writer for driver not found"));
- CompletableFuture<? extends PlcWriteResponse> completableFuture = plcWriter.write(builder.build());
+ CompletableFuture<? extends PlcWriteResponse> completableFuture = builder.build().execute();
int currentlyOpenRequests = openRequests.incrementAndGet();
try {
log.debug("Currently open requests including {}:{}", exchange, currentlyOpenRequests);
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
index 9a3ea9e..2be45b2 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java
@@ -21,13 +21,8 @@ package org.apache.plc4x.camel;
import org.apache.plc4x.java.api.PlcDriver;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcSubscriber;
-import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
+import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse;
import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest;
import org.slf4j.Logger;
@@ -61,11 +56,10 @@ public class MockDriver implements PlcDriver {
public PlcConnection connect(String url) {
// Mock a connection.
PlcConnection plcConnectionMock = mock(PlcConnection.class, RETURNS_DEEP_STUBS);
- when(plcConnectionMock.getWriter()).thenReturn(Optional.of(mock(PlcWriter.class, RETURNS_DEEP_STUBS)));
- when(plcConnectionMock.getReader()).thenReturn(Optional.of(mock(PlcReader.class, RETURNS_DEEP_STUBS)));
when(plcConnectionMock.readRequestBuilder()).thenReturn(Optional.of(mock(PlcReadRequest.Builder.class, RETURNS_DEEP_STUBS)));
when(plcConnectionMock.writeRequestBuilder()).thenReturn(Optional.of(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS)));
when(plcConnectionMock.subscriptionRequestBuilder()).thenReturn(Optional.of(mock(PlcSubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS)));
+ when(plcConnectionMock.unsubscriptionRequestBuilder()).thenReturn(Optional.of(mock(PlcUnsubscriptionRequest.Builder.class, RETURNS_DEEP_STUBS)));
// Mock a typical subscriber.
PlcSubscriber plcSubscriber = mock(PlcSubscriber.class, RETURNS_DEEP_STUBS);
@@ -97,7 +91,6 @@ public class MockDriver implements PlcDriver {
responseFuture.complete(response);
return responseFuture;
});
- when(plcConnectionMock.getSubscriber()).thenReturn(Optional.of(plcSubscriber));
return plcConnectionMock;
}
diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
index 60706d6..0068a11 100644
--- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
+++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XProducerTest.java
@@ -48,9 +48,6 @@ public class Plc4XProducerTest {
when(endpointMock.getEndpointUri()).thenReturn("plc4x:mock:10.10.10.1/1/1");
PlcDriverManager plcDriverManagerMock = mock(PlcDriverManager.class, RETURNS_DEEP_STUBS);
- when(plcDriverManagerMock.getConnection(anyString()).getWriter())
- .thenReturn(Optional.of(mock(PlcWriter.class, RETURNS_DEEP_STUBS)));
-
when(plcDriverManagerMock.getConnection(anyString()).writeRequestBuilder())
.thenReturn(Optional.of(mock(PlcWriteRequest.Builder.class, RETURNS_DEEP_STUBS)));
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index 4e1fbcd..e3e23cc 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -24,8 +24,6 @@ import org.apache.edgent.function.Function;
import org.apache.edgent.function.Supplier;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
@@ -117,9 +115,7 @@ public class PlcConnectionAdapter implements AutoCloseable {
PlcConnection connection = null;
try {
connection = getConnection();
- PlcReader reader = connection.getReader()
- .orElseThrow(() -> new PlcException("This connection doesn't support reading"));
- return reader.read(readRequest).get();
+ return readRequest.execute().get();
} catch (Exception e) {
logger.error("reading from plc device {} {} failed", connection, readRequest, e);
return null;
@@ -154,10 +150,8 @@ public class PlcConnectionAdapter implements AutoCloseable {
PlcField field = null;
try {
connection = getConnection();
- PlcReader reader = connection.getReader()
- .orElseThrow(() -> new PlcException("This connection doesn't support reading"));
PlcReadRequest readRequest = connection.readRequestBuilder().orElseThrow(() -> new PlcException("This connection doesn't support reading")).addItem(FIELD_NAME, fieldQuery).build();
- PlcReadResponse readResponse = reader.read(readRequest).get();
+ PlcReadResponse readResponse = readRequest.execute().get();
Object value = null;
switch (clientDatatype) {
case BYTE:
@@ -219,12 +213,10 @@ public class PlcConnectionAdapter implements AutoCloseable {
PlcConnection connection = null;
try {
connection = getConnection();
- PlcWriter writer = connection.getWriter()
- .orElseThrow(() -> new PlcException("This connection doesn't support writing"));
PlcWriteRequest.Builder builder = connection.writeRequestBuilder().orElseThrow(() -> new PlcException("This connection doesn't support writing"));
PlcWriteRequest writeRequest = builder.build();
addItem(builder, clientDatatype, fieldQuery, fieldValue);
- writer.write(writeRequest).get();
+ writeRequest.execute().get();
} catch (Exception e) {
logger.error("writing to plc device {} {} failed", connection, fieldQuery, e);
}
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
index 6829294..7459ac5 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSinkTask.java
@@ -24,7 +24,6 @@ import org.apache.kafka.connect.sink.SinkRecord;
import org.apache.kafka.connect.sink.SinkTask;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.kafka.util.VersionUtil;
@@ -37,7 +36,6 @@ public class Plc4xSinkTask extends SinkTask {
private String url;
private PlcConnection plcConnection;
- private PlcWriter plcWriter;
@Override
public String version() {
@@ -51,8 +49,9 @@ public class Plc4xSinkTask extends SinkTask {
openConnection();
- plcWriter = plcConnection.getWriter()
- .orElseThrow(() -> new ConnectException("PlcReader not available for this type of connection"));
+ if (!plcConnection.writeRequestBuilder().isPresent()) {
+ throw new ConnectException("Writing not supported on this connection");
+ }
}
@Override
@@ -107,7 +106,7 @@ public class Plc4xSinkTask extends SinkTask {
private void doWrite(PlcWriteRequest request) {
try {
- plcWriter.write(request).get();
+ request.execute().get();
} catch (ExecutionException | InterruptedException e) {
throw new ConnectException("Caught exception during write", e);
}
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 08b3ec1..7a2b21b 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -27,7 +27,6 @@ import org.apache.kafka.connect.source.SourceRecord;
import org.apache.kafka.connect.source.SourceTask;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
@@ -61,8 +60,6 @@ public class Plc4xSourceTask extends SourceTask {
private List<String> queries;
private PlcConnection plcConnection;
- private PlcReader plcReader;
- private PlcReadRequest plcRequest;
// TODO: should we use shared (static) thread pool for this?
private ScheduledExecutorService scheduler;
@@ -82,15 +79,9 @@ public class Plc4xSourceTask extends SourceTask {
openConnection();
- plcReader = plcConnection.getReader()
- .orElseThrow(() -> new ConnectException("PlcReader not available for this type of connection"));
-
-
- PlcReadRequest.Builder builder = plcConnection.readRequestBuilder().get();
- for (String query : queries) {
- builder.addItem(query, query);
+ if (!plcConnection.readRequestBuilder().isPresent()) {
+ throw new ConnectException("Reading not supported on this connection");
}
- plcRequest = builder.build();
int rate = Integer.valueOf(props.get(Plc4xSourceConnector.RATE_CONFIG));
scheduler = Executors.newScheduledThreadPool(1);
@@ -154,7 +145,7 @@ public class Plc4xSourceTask extends SourceTask {
}
private List<SourceRecord> doFetch() throws InterruptedException {
- final CompletableFuture<PlcReadResponse> response = plcReader.read(plcRequest);
+ final CompletableFuture<? extends PlcReadResponse> response = createReadRequest().execute();
try {
final PlcReadResponse received = response.get(TIMEOUT_LIMIT_MILLIS, TimeUnit.MILLISECONDS);
return extractValues(received);
@@ -165,6 +156,14 @@ public class Plc4xSourceTask extends SourceTask {
}
}
+ private PlcReadRequest createReadRequest() {
+ PlcReadRequest.Builder builder = plcConnection.readRequestBuilder().get();
+ for (String query : queries) {
+ builder.addItem(query, query);
+ }
+ return builder.build();
+ }
+
private List<SourceRecord> extractValues(PlcReadResponse response) {
final List<SourceRecord> result = new LinkedList<>();
for (String query : queries) {
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
index 973855b..a72ea23 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSinkProcessor.java
@@ -29,7 +29,6 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
@@ -53,8 +52,9 @@ public class Plc4xSinkProcessor extends BasePlc4xProcessor {
// Get an instance of a component able to write to a PLC.
PlcConnection connection = getConnection();
- PlcWriter writer = connection.getWriter().orElseThrow(
- () -> new ProcessException("Writing not supported by connection"));
+ if (!connection.writeRequestBuilder().isPresent()) {
+ throw new ProcessException("Writing not supported by connection");
+ }
// Prepare the request.
PlcWriteRequest.Builder builder = connection.writeRequestBuilder().get();
@@ -67,7 +67,7 @@ public class Plc4xSinkProcessor extends BasePlc4xProcessor {
PlcWriteRequest writeRequest = builder.build();
// Send the request to the PLC.
- CompletableFuture<PlcWriteResponse> future = writer.write(writeRequest);
+ CompletableFuture<? extends PlcWriteResponse> future = writeRequest.execute();
future.whenComplete((response, throwable) -> {
if (throwable != null) {
session.transfer(session.create(), FAILURE);
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
index 190a00d..7254e90 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
+++ b/integrations/apache-nifi/nifi-plc4x-processors/src/main/java/org/apache/plc4x/nifi/Plc4xSourceProcessor.java
@@ -28,7 +28,6 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
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.json.simple.JSONObject;
@@ -47,23 +46,24 @@ public class Plc4xSourceProcessor extends BasePlc4xProcessor {
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
// Get an instance of a component able to read from a PLC.
PlcConnection connection = getConnection();
- PlcReader reader = connection.getReader().orElseThrow(
- () -> new ProcessException("Writing not supported by connection"));
// Prepare the request.
- PlcReadRequest.Builder builder = connection.readRequestBuilder().get();
- getFields().forEach(field -> {
- String address = getAddress(field);
- if(address != null) {
- builder.addItem(field, address);
- }
- });
- PlcReadRequest readRequest = builder.build();
+ if (!connection.readRequestBuilder().isPresent()) {
+ throw new ProcessException("Writing not supported by connection");
+ }
FlowFile flowFile = session.create();
session.append(flowFile, out -> {
try {
- PlcReadResponse response = reader.read(readRequest).get();
+ PlcReadRequest.Builder builder = connection.readRequestBuilder().get();
+ getFields().forEach(field -> {
+ String address = getAddress(field);
+ if(address != null) {
+ builder.addItem(field, address);
+ }
+ });
+ PlcReadRequest readRequest = builder.build();
+ PlcReadResponse response = readRequest.execute().get();
JSONObject obj = new JSONObject();
for (String fieldName : response.getFieldNames()) {
for(int i = 0; i < response.getNumberOfValues(fieldName); i++) {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
index 66a3778..a6da03d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcConnection.java
@@ -65,12 +65,4 @@ public interface PlcConnection extends AutoCloseable {
Optional<PlcUnsubscriptionRequest.Builder> unsubscriptionRequestBuilder();
- // the following methods should be moved to the SPI
-
- Optional<PlcReader> getReader();
-
- Optional<PlcWriter> getWriter();
-
- Optional<PlcSubscriber> getSubscriber();
-
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index 6d50da0..133868d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -37,6 +37,4 @@ public interface PlcReader {
*/
CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest);
- //PlcReadRequest.Builder readRequestBuilder();
-
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
index d1c97ba..4a3f6cc 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcSubscriber.java
@@ -62,8 +62,4 @@ public interface PlcSubscriber {
*/
void unregister(PlcConsumerRegistration registration);
- //PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
-
- //PlcUnsubscriptionRequest.Builder unsubscriptionRequestBuilder();
-
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index a4e44bf..db52de6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -37,6 +37,4 @@ public interface PlcWriter {
*/
CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest);
- //PlcWriteRequest.Builder writeRequestBuilder();
-
}
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
index 6e99861..283663a 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java
@@ -43,22 +43,19 @@ public class ManualPlc4XAdsTest {
try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
System.out.println("PlcConnection " + plcConnection);
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
-
PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("station", "Allgemein_S2.Station:BYTE").build();
- CompletableFuture<PlcReadResponse> response = reader.read(readRequest);
+ CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
PlcReadResponse readResponse = response.get();
System.out.println("Response " + readResponse);
Collection<Integer> stations = readResponse.getAllIntegers("station");
stations.forEach(System.out::println);
- PlcSubscriber plcSubscriber = plcConnection.getSubscriber().orElseThrow(() -> new RuntimeException("Subscribe not available"));
-
PlcSubscriptionRequest subscriptionRequest = plcConnection.subscriptionRequestBuilder().get().addChangeOfStateField("stationChange", "Allgemein_S2.Station:BYTE").build();
- CompletableFuture<PlcSubscriptionResponse> subscribeResponse = plcSubscriber.subscribe(subscriptionRequest);
+ CompletableFuture<? extends PlcSubscriptionResponse> subscribeResponse = subscriptionRequest.execute();
PlcSubscriptionResponse plcSubscriptionResponse = subscribeResponse.get();
- PlcConsumerRegistration plcConsumerRegistration = plcSubscriber.register(System.out::println, plcSubscriptionResponse.getSubscriptionHandles());
+ // TODO: figure out what to do with this
+ /*PlcConsumerRegistration plcConsumerRegistration = plcSubscriber.register(System.out::println, plcSubscriptionResponse.getSubscriptionHandles());
TimeUnit.SECONDS.sleep(5);
@@ -68,7 +65,7 @@ public class ManualPlc4XAdsTest {
unsubscriptionResponse
.get(5, TimeUnit.SECONDS);
- System.out.println(unsubscriptionResponse);
+ System.out.println(unsubscriptionResponse);*/
}
System.exit(0);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
index 8dcedd8..28be93f 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/AbstractPlcConnection.java
@@ -23,14 +23,10 @@ import io.netty.channel.ChannelHandler;
import io.netty.util.HashedWheelTimer;
import io.netty.util.Timer;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
-import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcIoException;
import java.util.Objects;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -115,30 +111,6 @@ public abstract class AbstractPlcConnection implements PlcConnection {
// Implemented in sub-classes, if needed.
}
- @Override
- public Optional<PlcReader> getReader() {
- if (this instanceof PlcReader) {
- return Optional.of((PlcReader) this);
- }
- return Optional.empty();
- }
-
- @Override
- public Optional<PlcWriter> getWriter() {
- if (this instanceof PlcWriter) {
- return Optional.of((PlcWriter) this);
- }
- return Optional.empty();
- }
-
- @Override
- public Optional<PlcSubscriber> getSubscriber() {
- if (this instanceof PlcSubscriber) {
- return Optional.of((PlcSubscriber) this);
- }
- return Optional.empty();
- }
-
/**
* Can be used to check and cast a parameter to its required internal type (can be used for general type checking too).
*
diff --git a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
index 949eaeb..95cc511 100644
--- a/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
+++ b/plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
@@ -20,7 +20,6 @@ package org.apache.plc4x.java.ethernetip;
import org.apache.plc4x.java.PlcDriverManager;
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;
@@ -34,14 +33,11 @@ public class ManualPlc4XEtherNetIpTest {
try (PlcConnection plcConnection = new PlcDriverManager().getConnection(connectionUrl)) {
System.out.println("PlcConnection " + plcConnection);
- // Get a reader instance.
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
-
- PlcReadRequest readRequest = plcConnection.readRequestBuilder().get()
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().orElseThrow(() -> new RuntimeException("Reading not supported"))
.addItem("field", "#4#105#3").build();
// Execute the read operation.
- CompletableFuture<PlcReadResponse> response = reader.read(readRequest);
+ CompletableFuture<? extends PlcReadResponse> response = readRequest.execute();
PlcReadResponse readResponse = response.get();
// Output the response.
diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
index 3f6c786..910942a 100644
--- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
+++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java
@@ -21,8 +21,6 @@ package org.apache.plc4x.java.modbus;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
-import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
@@ -50,10 +48,9 @@ public class ManualPlc4XModbusTest {
System.out.println("PlcConnection " + plcConnection);
{
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
-
- PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomRegister", "register:7[3]").build();
- PlcReadResponse readResponse = reader.read(readRequest).get();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().orElseThrow(() -> new RuntimeException("No Reader found"))
+ .addItem("randomRegister", "register:7[3]").build();
+ PlcReadResponse readResponse = readRequest.execute().get();
System.out.println("Response " + readResponse);
readResponse.getAllByteArrays("randomRegister").stream()
.map(HexUtil::toHex)
@@ -63,11 +60,11 @@ public class ManualPlc4XModbusTest {
{
// Read an int from 2 registers
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomRegister", "register:3[2]").build();
- PlcReadResponse readResponse = reader.read(readRequest).get();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().orElseThrow(() -> new RuntimeException("No Reader found"))
+ .addItem("randomRegister", "register:3[2]").build();
+ PlcReadResponse readResponse = readRequest.execute().get();
System.out.println("Response " + readResponse);
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister");
randomRegisters.stream()
@@ -87,17 +84,16 @@ public class ManualPlc4XModbusTest {
{
// Read an int from 2 registers and multiple requests
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
// Just dump the actual values
- PlcReadRequest readRequest = plcConnection.readRequestBuilder().get()
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().orElseThrow(() -> new RuntimeException("No Reader found"))
.addItem("randomRegister1", "register:1[2]")
.addItem("randomRegister2", "register:10[3]")
.addItem("randomRegister3", "register:20[4]")
.addItem("randomRegister4", "register:30[5]")
.addItem("randomRegister5", "register:40[6]")
.build();
- PlcReadResponse readResponse = reader.read(readRequest).get();
+ PlcReadResponse readResponse = readRequest.execute().get();
System.out.println("Response " + readResponse);
IntStream.range(1, 6).forEach(i -> {
Collection<Byte[]> randomRegisters = readResponse.getAllByteArrays("randomRegister" + i);
@@ -118,10 +114,9 @@ public class ManualPlc4XModbusTest {
}
{
- PlcReader reader = plcConnection.getReader().orElseThrow(() -> new RuntimeException("No Reader found"));
-
- PlcReadRequest readRequest = plcConnection.readRequestBuilder().get().addItem("randomCoil", "coil:1[9]").build();
- PlcReadResponse readResponse = reader.read(readRequest).get();
+ PlcReadRequest readRequest = plcConnection.readRequestBuilder().orElseThrow(() -> new RuntimeException("No Reader found"))
+ .addItem("randomCoil", "coil:1[9]").build();
+ PlcReadResponse readResponse = readRequest.execute().get();
System.out.println("Response " + readResponse);
readResponse.getAllBooleans("randomCoil").stream()
.map(hex -> "Coil Value: " + hex)
@@ -129,10 +124,9 @@ public class ManualPlc4XModbusTest {
}
{
- PlcWriter writer = plcConnection.getWriter().orElseThrow(() -> new RuntimeException("No Writer found"));
-
- PlcWriteRequest writeRequest = plcConnection.writeRequestBuilder().get().addItem("randomCoilField", "coil:1", true).build();
- PlcWriteResponse writeResponse = writer.write(writeRequest).get();
+ PlcWriteRequest writeRequest = plcConnection.writeRequestBuilder().orElseThrow(() -> new RuntimeException("No Writer found"))
+ .addItem("randomCoilField", "coil:1", true).build();
+ PlcWriteResponse writeResponse = writeRequest.execute().get();
System.out.println("Response " + writeResponse);
}
} catch (Exception e) {
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
index 68b1ba3..4c5764b 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java
@@ -22,7 +22,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.connection.PlcSubscriber;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.types.PlcResponseCode;
@@ -62,21 +61,6 @@ class TestConnection implements PlcConnection, PlcReader, PlcWriter {
}
@Override
- public Optional<PlcReader> getReader() {
- return Optional.of(this);
- }
-
- @Override
- public Optional<PlcWriter> getWriter() {
- return Optional.of(this);
- }
-
- @Override
- public Optional<PlcSubscriber> getSubscriber() {
- return Optional.empty(); // TODO: implement this
- }
-
- @Override
public Optional<PlcReadRequest.Builder> readRequestBuilder() {
return Optional.of(new DefaultPlcReadRequest.Builder(this, new TestFieldHandler()));
}