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:14 UTC
[incubator-plc4x] 07/19: fixed integrations to use the new api
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++) {