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 14:40:17 UTC
[incubator-plc4x] 05/12: Rename CheckedPlc* to TypeSafePlc*
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 3615ee46225480b43184428ab07ad7a785912d10
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 11 12:39:55 2018 +0100
Rename CheckedPlc* to TypeSafePlc*
---
.../main/java/org/apache/plc4x/java/api/connection/PlcReader.java | 8 ++++----
.../main/java/org/apache/plc4x/java/api/connection/PlcWriter.java | 8 ++++----
.../java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 8 ++++----
.../java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 8 ++++----
.../plc4x/java/api/messages/specific/SinglePlcReadRequest.java | 2 +-
.../plc4x/java/api/messages/specific/SinglePlcReadResponse.java | 2 +-
.../plc4x/java/api/messages/specific/SinglePlcWriteRequest.java | 2 +-
.../plc4x/java/api/messages/specific/SinglePlcWriteResponse.java | 2 +-
.../{CheckedPlcReadRequest.java => TypeSafePlcReadRequest.java} | 8 ++++----
.../{CheckedPlcReadResponse.java => TypeSafePlcReadResponse.java} | 6 +++---
.../{CheckedPlcWriteRequest.java => TypeSafePlcWriteRequest.java} | 8 ++++----
...CheckedPlcWriteResponse.java => TypeSafePlcWriteResponse.java} | 6 +++---
12 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index 91c3c7d..f6569fb 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -20,8 +20,8 @@ package org.apache.plc4x.java.api.connection;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcReadRequest;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcReadResponse;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcReadResponse;
import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
import org.apache.plc4x.java.api.messages.specific.SinglePlcReadResponse;
@@ -60,8 +60,8 @@ public interface PlcReader {
* @return a {@link CompletableFuture} giving async access to the returned value.
*/
@SuppressWarnings("unchecked")
- default <T> CompletableFuture<CheckedPlcReadResponse<T>> read(CheckedPlcReadRequest<T> readRequest) {
- return (CompletableFuture<CheckedPlcReadResponse<T>>) read((PlcReadRequest) readRequest);
+ default <T> CompletableFuture<TypeSafePlcReadResponse<T>> read(TypeSafePlcReadRequest<T> readRequest) {
+ return (CompletableFuture<TypeSafePlcReadResponse<T>>) read((PlcReadRequest) readRequest);
}
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index 5ae800c..071bd3b 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.api.connection;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcWriteRequest;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcWriteResponse;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteResponse;
import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteResponse;
@@ -61,8 +61,8 @@ public interface PlcWriter {
* @return a {@link CompletableFuture} giving async access to the response of the write operation.
*/
@SuppressWarnings("unchecked")
- default <T> CompletableFuture<CheckedPlcWriteResponse<T>> write(CheckedPlcWriteRequest<T> writeRequest) {
- return (CompletableFuture<CheckedPlcWriteResponse<T>>) write((PlcWriteRequest) writeRequest);
+ default <T> CompletableFuture<TypeSafePlcWriteResponse<T>> write(TypeSafePlcWriteRequest<T> writeRequest) {
+ return (CompletableFuture<TypeSafePlcWriteResponse<T>>) write((PlcWriteRequest) writeRequest);
}
}
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 674c902..4714d6d 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
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcReadRequest;
import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
import org.apache.plc4x.java.api.model.Address;
@@ -116,7 +116,7 @@ public class PlcReadRequest implements PlcRequest {
if (mixed) {
plcReadRequest = new PlcReadRequest();
} else {
- plcReadRequest = new CheckedPlcReadRequest<>(firstType);
+ plcReadRequest = new TypeSafePlcReadRequest<>(firstType);
}
for (ReadRequestItem request : requests) {
plcReadRequest.addItem(request);
@@ -144,7 +144,7 @@ public class PlcReadRequest implements PlcRequest {
}
@SuppressWarnings("unchecked")
- public <T> CheckedPlcReadRequest<T> buildBulk(Class<T> type) {
+ public <T> TypeSafePlcReadRequest<T> buildBulk(Class<T> type) {
if (requests.size() < 2) {
throw new IllegalStateException("Checked bulk request needs more than one request");
}
@@ -154,7 +154,7 @@ public class PlcReadRequest implements PlcRequest {
if (mixed) {
throw new IllegalStateException("Mixed types contained");
}
- return (CheckedPlcReadRequest<T>) build();
+ return (TypeSafePlcReadRequest<T>) build();
}
}
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 cba4d7d..71251b2 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
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
-import org.apache.plc4x.java.api.messages.specific.CheckedPlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest;
import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.api.model.Address;
@@ -105,7 +105,7 @@ public class PlcWriteRequest implements PlcRequest {
if (mixed) {
plcWriteRequest = new PlcWriteRequest();
} else {
- plcWriteRequest = new CheckedPlcWriteRequest<>(firstType);
+ plcWriteRequest = new TypeSafePlcWriteRequest<>(firstType);
}
for (WriteRequestItem request : requests) {
plcWriteRequest.addItem(request);
@@ -133,7 +133,7 @@ public class PlcWriteRequest implements PlcRequest {
}
@SuppressWarnings("unchecked")
- public <T> CheckedPlcWriteRequest<T> buildBulk(Class<T> type) {
+ public <T> TypeSafePlcWriteRequest<T> buildBulk(Class<T> type) {
if (requests.size() < 2) {
throw new IllegalStateException("Checked bulk request needs more than one request");
}
@@ -143,7 +143,7 @@ public class PlcWriteRequest implements PlcRequest {
if (mixed) {
throw new IllegalStateException("Mixed types contained");
}
- return (CheckedPlcWriteRequest<T>) build();
+ return (TypeSafePlcWriteRequest<T>) build();
}
}
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 7f5e4bc..a8226c2 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
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-public class SinglePlcReadRequest<T> extends CheckedPlcReadRequest<T> {
+public class SinglePlcReadRequest<T> extends TypeSafePlcReadRequest<T> {
private ReadRequestItem<T> requestItem;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
index 0b985ed..c835998 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-public class SinglePlcReadResponse<T> extends CheckedPlcReadResponse<T> {
+public class SinglePlcReadResponse<T> extends TypeSafePlcReadResponse<T> {
private final SinglePlcReadRequest<T> request;
private final ReadResponseItem<T> responseItem;
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 d0d5085..35ac219 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
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-public class SinglePlcWriteRequest<T> extends CheckedPlcWriteRequest<T> {
+public class SinglePlcWriteRequest<T> extends TypeSafePlcWriteRequest<T> {
private WriteRequestItem<T> requestItem;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
index 28e2310..eb9b52a 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-public class SinglePlcWriteResponse<T> extends CheckedPlcWriteResponse<T> {
+public class SinglePlcWriteResponse<T> extends TypeSafePlcWriteResponse<T> {
private final SinglePlcWriteRequest<T> request;
private final WriteResponseItem<T> responseItem;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
similarity index 88%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
index b6ae5ea..58ff74e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
@@ -25,23 +25,23 @@ import org.apache.plc4x.java.api.model.Address;
import java.util.LinkedList;
import java.util.List;
-public class CheckedPlcReadRequest<T> extends PlcReadRequest {
+public class TypeSafePlcReadRequest<T> extends PlcReadRequest {
private final List<ReadRequestItem<T>> readRequestItems;
private Class<T> datatype;
- public CheckedPlcReadRequest(Class<T> type) {
+ public TypeSafePlcReadRequest(Class<T> type) {
this.datatype = type;
this.readRequestItems = new LinkedList<>();
}
- public CheckedPlcReadRequest(Class<T> dataType, Address address) {
+ public TypeSafePlcReadRequest(Class<T> dataType, Address address) {
this(dataType);
addItem(new ReadRequestItem<>(dataType, address));
}
- public CheckedPlcReadRequest(Class<T> dataType, Address address, int size) {
+ public TypeSafePlcReadRequest(Class<T> dataType, Address address, int size) {
this(dataType);
addItem(new ReadRequestItem<>(dataType, address, size));
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
similarity index 85%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
index 19df33a..c6b0d33 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
@@ -24,12 +24,12 @@ import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import java.util.List;
-public class CheckedPlcReadResponse<T> extends PlcReadResponse {
+public class TypeSafePlcReadResponse<T> extends PlcReadResponse {
- private final CheckedPlcReadRequest<T> request;
+ private final TypeSafePlcReadRequest<T> request;
private final List<ReadResponseItem<T>> responseItems;
- public CheckedPlcReadResponse(CheckedPlcReadRequest<T> request, List<ReadResponseItem<T>> responseItems) {
+ public TypeSafePlcReadResponse(TypeSafePlcReadRequest<T> request, List<ReadResponseItem<T>> responseItems) {
super(null, null);
this.request = request;
this.responseItems = responseItems;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
similarity index 87%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
index b8c63f6..8979cf5 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
@@ -25,23 +25,23 @@ import org.apache.plc4x.java.api.model.Address;
import java.util.LinkedList;
import java.util.List;
-public class CheckedPlcWriteRequest<T> extends PlcWriteRequest {
+public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
private final List<WriteRequestItem<T>> requestItems;
private final Class<T> datatype;
- public CheckedPlcWriteRequest(Class<T> type) {
+ public TypeSafePlcWriteRequest(Class<T> type) {
this.datatype = type;
this.requestItems = new LinkedList<>();
}
- public CheckedPlcWriteRequest(Class<T> dataType, Address address, T... values) {
+ public TypeSafePlcWriteRequest(Class<T> dataType, Address address, T... values) {
this(dataType);
addItem(new WriteRequestItem<>(dataType, address, values));
}
- public CheckedPlcWriteRequest(Class<T> dataType, List<WriteRequestItem<T>> requestItems) {
+ public TypeSafePlcWriteRequest(Class<T> dataType, List<WriteRequestItem<T>> requestItems) {
this(dataType);
this.requestItems.addAll(requestItems);
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
similarity index 85%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
index 91ca855..2b9e164 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedPlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
@@ -24,12 +24,12 @@ import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
import java.util.List;
-public class CheckedPlcWriteResponse<T> extends PlcWriteResponse {
+public class TypeSafePlcWriteResponse<T> extends PlcWriteResponse {
- private final CheckedPlcWriteRequest<T> request;
+ private final TypeSafePlcWriteRequest<T> request;
private final List<WriteResponseItem<T>> responseItems;
- public CheckedPlcWriteResponse(CheckedPlcWriteRequest<T> request, List<WriteResponseItem<T>> responseItems) {
+ public TypeSafePlcWriteResponse(TypeSafePlcWriteRequest<T> request, List<WriteResponseItem<T>> responseItems) {
super(null, null);
this.request = request;
this.responseItems = responseItems;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.