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:11 UTC
[incubator-plc4x] 04/19: implemented new api for ethernet/ip
protocol
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()) {