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:13 UTC
[incubator-plc4x] 06/19: implemented new api for s7 and test
protocols
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);
}