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 <andrey.skori...@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; /**