You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/01/05 11:09:06 UTC
[incubator-plc4x] branch refactoring/java_generify updated: added a
couple of default methods to the interfaces
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch refactoring/java_generify
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/refactoring/java_generify by this push:
new 6badd3b added a couple of default methods to the interfaces
6badd3b is described below
commit 6badd3b549576116a10e6d95a16b547cb8695c66
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jan 5 12:09:02 2018 +0100
added a couple of default methods to the interfaces
---
.../plc4x/java/api/messages/BulkPlcReadRequest.java | 3 ---
.../plc4x/java/api/messages/BulkPlcWriteRequest.java | 3 ---
.../plc4x/java/api/messages/PlcReadRequest.java | 14 +++++++++++++-
.../plc4x/java/api/messages/PlcReadResponse.java | 14 ++++++++++++++
.../plc4x/java/api/messages/PlcWriteRequest.java | 14 +++++++++++++-
.../plc4x/java/api/messages/PlcWriteResponse.java | 14 ++++++++++++++
.../java/api/messages/SinglePlcWriteRequest.java | 20 ++++++++++----------
7 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java
index 58f68a2..b0466a0 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java
@@ -51,7 +51,4 @@ public class BulkPlcReadRequest implements PlcReadRequest {
return readRequestItems;
}
- public int getNumberOfItems() {
- return readRequestItems.size();
- }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java
index c1cbf10..c2a4a4d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java
@@ -55,7 +55,4 @@ public class BulkPlcWriteRequest implements PlcWriteRequest {
return requestItems;
}
- public int getNumberOfItems() {
- return requestItems.size();
- }
}
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 d016947..d889540 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
@@ -27,6 +27,18 @@ public interface PlcReadRequest extends PlcRequest {
List<? extends ReadRequestItem> getReadRequestItems();
- int getNumberOfItems();
+ default ReadRequestItem<?> getReadRequestItem() {
+ if (getNumberOfItems() > 1) {
+ throw new IllegalStateException("too many items " + getNumberOfItems());
+ }
+ if (getNumberOfItems() < 1) {
+ return null;
+ }
+ return getReadRequestItems().get(0);
+ }
+
+ default int getNumberOfItems() {
+ return getReadRequestItems().size();
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
index 43b3b88..c8a69c2 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java
@@ -26,4 +26,18 @@ public interface PlcReadResponse extends PlcResponse {
PlcReadRequest getRequest();
List<? extends ReadResponseItem> getResponseItems();
+
+ default ReadResponseItem<?> getResponseItem() {
+ if (getNumberOfItems() > 1) {
+ throw new IllegalStateException("too many items " + getNumberOfItems());
+ }
+ if (getNumberOfItems() < 1) {
+ return null;
+ }
+ return getResponseItems().get(0);
+ }
+
+ default int getNumberOfItems() {
+ return getResponseItems().size();
+ }
}
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 e39d3f9..8d137fc 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
@@ -27,5 +27,17 @@ public interface PlcWriteRequest extends PlcRequest {
List<? extends WriteRequestItem> getRequestItems();
- int getNumberOfItems();
+ default WriteRequestItem<?> getRequestItem() {
+ if (getNumberOfItems() > 1) {
+ throw new IllegalStateException("too many items " + getNumberOfItems());
+ }
+ if (getNumberOfItems() < 1) {
+ return null;
+ }
+ return getRequestItems().get(0);
+ }
+
+ default int getNumberOfItems() {
+ return getRequestItems().size();
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
index de88b18..253816f 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
@@ -26,4 +26,18 @@ public interface PlcWriteResponse extends PlcResponse {
PlcWriteRequest getRequest();
List<? extends WriteResponseItem> getResponseItems();
+
+ default WriteResponseItem<?> getResponseItem() {
+ if (getNumberOfItems() > 1) {
+ throw new IllegalStateException("too many items " + getNumberOfItems());
+ }
+ if (getNumberOfItems() < 1) {
+ return null;
+ }
+ return getResponseItems().get(0);
+ }
+
+ default int getNumberOfItems() {
+ return getResponseItems().size();
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java
index 085cc04..3499019 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java
@@ -26,7 +26,7 @@ import java.util.List;
public class SinglePlcWriteRequest<T> implements PlcWriteRequest {
- private WriteRequestItem<T> writeRequestItem;
+ private WriteRequestItem<T> requestItem;
public SinglePlcWriteRequest() {
}
@@ -41,27 +41,27 @@ public class SinglePlcWriteRequest<T> implements PlcWriteRequest {
@Override
@SuppressWarnings("unchecked")
- public void addItem(WriteRequestItem writeRequestItem) {
- if (this.writeRequestItem != null && writeRequestItem != null) {
+ public void addItem(WriteRequestItem requestItem) {
+ if (this.requestItem != null && requestItem != null) {
throw new IllegalStateException(SinglePlcReadRequest.class.getName() + " can only contain on readRequestItem");
}
- this.writeRequestItem = (WriteRequestItem<T>) writeRequestItem;
+ this.requestItem = (WriteRequestItem<T>) requestItem;
}
@Override
public List<WriteRequestItem<T>> getRequestItems() {
- return (writeRequestItem != null) ? Collections.singletonList(writeRequestItem) : Collections.emptyList();
+ return (requestItem != null) ? Collections.singletonList(requestItem) : Collections.emptyList();
}
- public WriteRequestItem<T> getWriteRequestItem() {
- return writeRequestItem;
+ public WriteRequestItem<T> getRequestItem() {
+ return requestItem;
}
- public void setWriteRequestItem(WriteRequestItem<T> writeRequestItem) {
- this.writeRequestItem = writeRequestItem;
+ public void setWriteRequestItem(WriteRequestItem<T> requestItem) {
+ this.requestItem = requestItem;
}
public int getNumberOfItems() {
- return writeRequestItem != null ? 1 : 0;
+ return requestItem != null ? 1 : 0;
}
}
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].