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/11 09:07:10 UTC
[incubator-plc4x] branch refactoring/java_generify updated: added
indicator methods to reponses.
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 b1aa871 added indicator methods to reponses.
b1aa871 is described below
commit b1aa8715a30e1e43731fc339b06adfc17d19be27
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 11 10:07:06 2018 +0100
added indicator methods to reponses.
---
.../org/apache/plc4x/java/api/messages/PlcReadResponse.java | 12 ++++++++++--
.../org/apache/plc4x/java/api/messages/PlcWriteResponse.java | 12 ++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
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 2bd37a9..fe05425 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
@@ -30,10 +30,10 @@ public interface PlcReadResponse extends PlcResponse {
List<? extends ReadResponseItem> getResponseItems();
default Optional<? extends ReadResponseItem<?>> getResponseItem() {
- if (getNumberOfItems() > 1) {
+ if (isMultiValue()) {
throw new IllegalStateException("too many items " + getNumberOfItems());
}
- if (getNumberOfItems() < 1) {
+ if (isEmpty()) {
return Optional.empty();
}
return Optional.<ReadResponseItem<?>>of(getResponseItems().get(0));
@@ -43,6 +43,14 @@ public interface PlcReadResponse extends PlcResponse {
return getResponseItems().size();
}
+ default boolean isMultiValue() {
+ return getNumberOfItems() > 1;
+ }
+
+ default boolean isEmpty() {
+ return getNumberOfItems() < 1;
+ }
+
@SuppressWarnings("unchecked")
default <T> Optional<ReadResponseItem<T>> getValue(ReadRequestItem<T> item) {
return getResponseItems().stream()
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 0466fff..ce9c0c6 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
@@ -30,10 +30,10 @@ public interface PlcWriteResponse extends PlcResponse {
List<? extends WriteResponseItem> getResponseItems();
default Optional<? extends WriteResponseItem<?>> getResponseItem() {
- if (getNumberOfItems() > 1) {
+ if (isMultiValue()) {
throw new IllegalStateException("too many items " + getNumberOfItems());
}
- if (getNumberOfItems() < 1) {
+ if (isEmpty()) {
return Optional.empty();
}
return Optional.<WriteResponseItem<?>>of(getResponseItems().get(0));
@@ -43,6 +43,14 @@ public interface PlcWriteResponse extends PlcResponse {
return getResponseItems().size();
}
+ default boolean isMultiValue() {
+ return getNumberOfItems() > 1;
+ }
+
+ default boolean isEmpty() {
+ return getNumberOfItems() < 1;
+ }
+
@SuppressWarnings("unchecked")
default <T> Optional<WriteResponseItem<T>> getValue(WriteRequestItem<T> item) {
return getResponseItems().stream()
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].