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:21:05 UTC
[incubator-plc4x] branch refactoring/java_generify updated: small
cleanup on api
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 fc694ac small cleanup on api
fc694ac is described below
commit fc694ac545e84aaf60b7aa67edac8d9abbc6d377
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 11 10:20:59 2018 +0100
small cleanup on api
---
.../plc4x/java/api/messages/PlcReadRequest.java | 6 ++---
.../plc4x/java/api/messages/PlcWriteRequest.java | 4 +---
.../api/messages/specific/BulkPlcReadRequest.java | 4 ++++
.../messages/specific/SinglePlcReadRequest.java | 28 ++++++++++++----------
.../messages/specific/SinglePlcWriteRequest.java | 6 ++++-
5 files changed, 28 insertions(+), 20 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 3cacca5..8b06790 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
@@ -33,7 +33,7 @@ public interface PlcReadRequest extends PlcRequest {
List<? extends ReadRequestItem<?>> getReadRequestItems();
- default Optional<? extends ReadRequestItem<?>> getReadRequestItem() {
+ default Optional<? extends ReadRequestItem<?>> getRequestItem() {
if (getNumberOfItems() > 1) {
throw new IllegalStateException("too many items " + getNumberOfItems());
}
@@ -86,9 +86,7 @@ public interface PlcReadRequest extends PlcRequest {
throw new IllegalStateException("No requests added");
}
if (requests.size() < 2) {
- SinglePlcReadRequest<?> singlePlcReadRequest = new SinglePlcReadRequest<>();
- singlePlcReadRequest.addItem(requests.get(0));
- return singlePlcReadRequest;
+ return new SinglePlcReadRequest<>(requests.get(0));
}
PlcReadRequest plcReadRequest;
if (mixed) {
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 0bbf2d7..e95ba29 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
@@ -86,9 +86,7 @@ public interface PlcWriteRequest extends PlcRequest {
throw new IllegalStateException("No requests added");
}
if (requests.size() < 2) {
- SinglePlcWriteRequest<?> singlePlcWriteRequest = new SinglePlcWriteRequest<>();
- singlePlcWriteRequest.addItem(requests.get(0));
- return singlePlcWriteRequest;
+ return new SinglePlcWriteRequest<>(requests.get(0));
}
PlcWriteRequest plcWriteRequest;
if (mixed) {
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
index a16a3ae..4b56e5a 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
@@ -44,6 +44,10 @@ public class BulkPlcReadRequest implements PlcReadRequest {
addItem(new ReadRequestItem(dataType, address, size));
}
+ public BulkPlcReadRequest(List<ReadRequestItem> readRequestItems) {
+ this.readRequestItems = readRequestItems;
+ }
+
public void addItem(ReadRequestItem readRequestItem) {
readRequestItems.add(readRequestItem);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
index 3abfba7..104281d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
@@ -28,42 +28,46 @@ import java.util.Optional;
public class SinglePlcReadRequest<T> implements PlcReadRequest {
- private ReadRequestItem<T> readRequestItem;
+ private ReadRequestItem<T> requestItem;
public SinglePlcReadRequest() {
}
+ public SinglePlcReadRequest(ReadRequestItem<T> requestItem) {
+ this.requestItem = requestItem;
+ }
+
public SinglePlcReadRequest(Class<T> dataType, Address address) {
- readRequestItem = new ReadRequestItem<>(dataType, address);
+ requestItem = new ReadRequestItem<>(dataType, address);
}
public SinglePlcReadRequest(Class<T> dataType, Address address, int size) {
- readRequestItem = new ReadRequestItem<>(dataType, address, size);
+ requestItem = new ReadRequestItem<>(dataType, address, size);
}
@Override
@SuppressWarnings("unchecked")
public void addItem(ReadRequestItem readRequestItem) {
- if (this.readRequestItem != null && readRequestItem != null) {
- throw new IllegalStateException(SinglePlcReadRequest.class.getName() + " can only contain on readRequestItem");
+ if (this.requestItem != null && readRequestItem != null) {
+ throw new IllegalStateException(SinglePlcReadRequest.class.getName() + " can only contain on requestItem");
}
- this.readRequestItem = (ReadRequestItem<T>) readRequestItem;
+ this.requestItem = (ReadRequestItem<T>) readRequestItem;
}
@Override
public List<ReadRequestItem<T>> getReadRequestItems() {
- return readRequestItem != null ? Collections.singletonList(readRequestItem) : Collections.emptyList();
+ return requestItem != null ? Collections.singletonList(requestItem) : Collections.emptyList();
}
- public Optional<ReadRequestItem<T>> getReadRequestItem() {
- return Optional.of(readRequestItem);
+ public Optional<ReadRequestItem<T>> getRequestItem() {
+ return Optional.of(requestItem);
}
- public void setReadRequestItem(ReadRequestItem<T> readRequestItem) {
- this.readRequestItem = readRequestItem;
+ public void setRequestItem(ReadRequestItem<T> requestItem) {
+ this.requestItem = requestItem;
}
public int getNumberOfItems() {
- return readRequestItem != null ? 1 : 0;
+ return requestItem != null ? 1 : 0;
}
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
index 34e323c..bf224ac 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
@@ -33,6 +33,10 @@ public class SinglePlcWriteRequest<T> implements PlcWriteRequest {
public SinglePlcWriteRequest() {
}
+ public SinglePlcWriteRequest(WriteRequestItem<T> requestItem) {
+ this.requestItem = requestItem;
+ }
+
public SinglePlcWriteRequest(Class<T> dataType, Address address, T value) {
addItem(new WriteRequestItem<>(dataType, address, value));
}
@@ -59,7 +63,7 @@ public class SinglePlcWriteRequest<T> implements PlcWriteRequest {
return Optional.ofNullable(requestItem);
}
- public void setWriteRequestItem(WriteRequestItem<T> requestItem) {
+ public void setRequestItem(WriteRequestItem<T> requestItem) {
this.requestItem = requestItem;
}
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].