[incubator-plc4x] 17/19: removed type parameter from request builder

[cdutz]

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