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/12 10:26:46 UTC
[incubator-plc4x] 03/07: small fixes: - added SafeVarargs where
required - remove unnecessary SuppressWarnings - make build methods final -
fixed typos
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 8a8968a12a9602499c8676b8e44964fa3f3bd6ee
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jan 12 11:00:07 2018 +0100
small fixes:
- added SafeVarargs where required
- remove unnecessary SuppressWarnings
- make build methods final
- fixed typos
---
.../org/apache/plc4x/java/api/messages/PlcReadRequest.java | 11 +++++------
.../java/org/apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 12 +++++++-----
.../plc4x/java/api/messages/items/WriteRequestItem.java | 7 ++++---
.../java/api/messages/specific/TypeSafePlcReadRequest.java | 1 +
.../java/api/messages/specific/TypeSafePlcWriteRequest.java | 5 +++--
6 files changed, 21 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 7ae3d78..3168e5b 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
@@ -51,26 +51,25 @@ public class PlcReadRequest extends PlcRequest<ReadRequestItem<?>> {
public static class Builder extends PlcRequest.Builder<ReadRequestItem<?>> {
- public Builder addItem(Class<?> dataType, Address address) {
+ public final Builder addItem(Class<?> dataType, Address address) {
checkType(dataType);
requests.add(new ReadRequestItem<>(dataType, address));
return this;
}
- public Builder addItem(Class<?> dataType, Address address, int size) {
+ public final Builder addItem(Class<?> dataType, Address address, int size) {
checkType(dataType);
requests.add(new ReadRequestItem<>(dataType, address, size));
return this;
}
- public Builder addItem(ReadRequestItem readRequestItem) {
+ public final Builder addItem(ReadRequestItem readRequestItem) {
checkType(readRequestItem.getDatatype());
requests.add(readRequestItem);
return this;
}
- @SuppressWarnings("unchecked")
- public PlcReadRequest build() {
+ public final PlcReadRequest build() {
if (requests.isEmpty()) {
throw new IllegalStateException("No requests added");
}
@@ -87,7 +86,7 @@ public class PlcReadRequest extends PlcRequest<ReadRequestItem<?>> {
}
@SuppressWarnings("unchecked")
- public <T> TypeSafePlcReadRequest<T> build(Class<T> type) {
+ public final <T> TypeSafePlcReadRequest<T> build(Class<T> type) {
if (firstType != type) {
throw new ClassCastException("Incompatible type " + type + ". Required " + firstType);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
index 4093870..66aca82 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java
@@ -78,7 +78,7 @@ public abstract class PlcRequest<REQUEST_ITEM extends RequestItem> implements Pl
public abstract static class Builder<REQUEST_ITEM> {
- Class firstType;
+ Class<?> firstType;
boolean mixed = false;
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 9441e52..ce23dc9 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
@@ -30,6 +30,7 @@ public class PlcWriteRequest extends PlcRequest<WriteRequestItem<?>> {
public PlcWriteRequest() {
}
+ @SafeVarargs
public <T> PlcWriteRequest(Class<T> dataType, Address address, T... values) {
addItem(new WriteRequestItem<>(dataType, address, values));
}
@@ -52,19 +53,20 @@ public class PlcWriteRequest extends PlcRequest<WriteRequestItem<?>> {
return this;
}
- public <T> PlcWriteRequest.Builder addItem(Class<T> dataType, Address address, T... values) {
+ @SafeVarargs
+ public final <T> PlcWriteRequest.Builder addItem(Class<T> dataType, Address address, T... values) {
checkType(dataType);
requests.add(new WriteRequestItem<>(dataType, address, values));
return this;
}
- public <T> PlcWriteRequest.Builder addItem(WriteRequestItem writeRequestItem) {
+ public final PlcWriteRequest.Builder addItem(WriteRequestItem<?> writeRequestItem) {
checkType(writeRequestItem.getDatatype());
+ requests.add(writeRequestItem);
return this;
}
- @SuppressWarnings("unchecked")
- public PlcWriteRequest build() {
+ public final PlcWriteRequest build() {
if (requests.isEmpty()) {
throw new IllegalStateException("No requests added");
}
@@ -81,7 +83,7 @@ public class PlcWriteRequest extends PlcRequest<WriteRequestItem<?>> {
}
@SuppressWarnings("unchecked")
- public <T> TypeSafePlcWriteRequest<T> build(Class<T> type) {
+ public final <T> TypeSafePlcWriteRequest<T> build(Class<T> type) {
if (firstType != type) {
throw new ClassCastException("Incompatible type " + type + ". Required " + firstType);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
index f95e658..8202e8d 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
@@ -29,9 +29,10 @@ public class WriteRequestItem<T> extends RequestItem<T, WriteResponseItem<T>> {
private final List<T> values;
- public WriteRequestItem(Class<T> datatype, Address address, T... values) {
- super(datatype, address);
- List<T> checkedList = Collections.checkedList(new ArrayList<>(), datatype);
+ @SafeVarargs
+ public WriteRequestItem(Class<T> dataType, Address address, T... values) {
+ super(dataType, address);
+ List<T> checkedList = Collections.checkedList(new ArrayList<>(), dataType);
checkedList.addAll(Arrays.asList(values));
this.values = checkedList;
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
index 02b66ce..49f8e3c 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
@@ -51,6 +51,7 @@ public class TypeSafePlcReadRequest<T> extends PlcReadRequest {
addItem(new ReadRequestItem<>(dataType, address, size));
}
+ @SafeVarargs
public TypeSafePlcReadRequest(Class<T> dataType, ReadRequestItem<T>... requestItems) {
this(dataType);
Objects.requireNonNull(requestItems);
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
index be55148..f8be231 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
@@ -41,11 +41,13 @@ public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
}
}
+ @SafeVarargs
public TypeSafePlcWriteRequest(Class<T> dataType, Address address, T... values) {
this(dataType);
addItem(new WriteRequestItem<>(dataType, address, values));
}
+ @SafeVarargs
public TypeSafePlcWriteRequest(Class<T> dataType, WriteRequestItem<T>... requestItems) {
this(dataType);
Objects.requireNonNull(requestItems);
@@ -53,9 +55,8 @@ public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
getRequestItems().add(requestItem);
}
}
-
+
@Override
- @SuppressWarnings("unchecked")
public void addItem(WriteRequestItem<?> writeRequestItem) {
Objects.requireNonNull(writeRequestItem);
if (writeRequestItem.getDatatype() != datatype) {
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.