You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2018/01/12 00:28:12 UTC
[incubator-plc4x] branch master updated (f091908 -> 52d1979)
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from f091908 implement double null check to avoid unnecessary waits
new 4a2d257 see https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
new 0eafa62 unneeded import
new 3e9e12a use isEmpty()
new c4595a4 right order
new 4b94b85 use isEmpty()
new a0ee2e8 use isEmpty()
new 023282f add @Overrides
new 5ea1720 unneeded import
new f079d20 add @Overrides
new 52d1979 add @Overrides
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/plc4x/java/api/connection/PlcWriter.java | 1 -
.../java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 2 +-
.../java/org/apache/plc4x/java/api/messages/PlcReadResponse.java | 1 -
.../main/java/org/apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 2 +-
.../java/org/apache/plc4x/java/api/messages/items/RequestItem.java | 1 +
.../plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java | 1 +
.../plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java | 6 ++++--
.../plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java | 5 +++--
.../plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java | 5 ++++-
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 6 +++++-
11 files changed, 21 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 01/10: see
https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 4a2d2575127bd69617d62bc68f83c26b8e589254
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 10:39:02 2018 +1100
see https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
---
.../java/org/apache/plc4x/java/api/messages/items/RequestItem.java | 1 +
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
index 56d20df..d193f79 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
@@ -61,6 +61,7 @@ public abstract class RequestItem<DATA_TYPE, RESPONSE_ITEM extends ResponseItem>
responseSet.await();
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new CompletionException(e);
} finally {
lock.unlock();
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 7091281..477993f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -146,7 +146,11 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
sessionSetupCompleteFuture.get();
} catch (UnknownHostException e) {
throw new PlcConnectionException("Unknown Host " + hostName, e);
- } catch (InterruptedException | ExecutionException e) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new PlcConnectionException(e);
+ }
+ catch (ExecutionException e) {
throw new PlcConnectionException(e);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 04/10: right order
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit c4595a438a1e67e7d81309ea897fed16bd3a24a7
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:08:12 2018 +1100
right order
---
.../src/main/java/org/apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 534242f..4093870 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
@@ -76,7 +76,7 @@ public abstract class PlcRequest<REQUEST_ITEM extends RequestItem> implements Pl
return getNumberOfItems() < 1;
}
- public static abstract class Builder<REQUEST_ITEM> {
+ public abstract static class Builder<REQUEST_ITEM> {
Class firstType;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 05/10: use isEmpty()
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 4b94b85c2a902e555b4efdb369d6bc87e0a8d376
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:08:28 2018 +1100
use isEmpty()
---
.../main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 7a6c1a4..9441e52 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
@@ -65,7 +65,7 @@ public class PlcWriteRequest extends PlcRequest<WriteRequestItem<?>> {
@SuppressWarnings("unchecked")
public PlcWriteRequest build() {
- if (requests.size() < 1) {
+ if (requests.isEmpty()) {
throw new IllegalStateException("No requests added");
}
PlcWriteRequest plcWriteRequest;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 07/10: add @Overrides
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 023282fe55b41bdf9b78222a5e0484628ed9e5fb
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:09:22 2018 +1100
add @Overrides
---
.../plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
index b02cd0b..3c72c36 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
@@ -39,17 +39,20 @@ public class TypeSafePlcWriteResponse<T> extends PlcWriteResponse {
super(request, responseItems);
}
+ @Override
+ @SuppressWarnings("unchecked")
public TypeSafePlcWriteRequest<T> getRequest() {
return (TypeSafePlcWriteRequest<T>) super.getRequest();
}
+ @Override
@SuppressWarnings("unchecked")
public List<? extends WriteResponseItem<T>> getResponseItems() {
return (List<WriteResponseItem<T>>) super.getResponseItems();
}
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("unchecked")
public Optional<WriteResponseItem<T>> getResponseItem() {
return (Optional<WriteResponseItem<T>>) super.getResponseItem();
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 03/10: use isEmpty()
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3e9e12a8e6812d72bf1b3bad9c0ade90bef433c8
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:07:33 2018 +1100
use isEmpty()
---
.../main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 4c7f2a9..7ae3d78 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
@@ -71,7 +71,7 @@ public class PlcReadRequest extends PlcRequest<ReadRequestItem<?>> {
@SuppressWarnings("unchecked")
public PlcReadRequest build() {
- if (requests.size() < 1) {
+ if (requests.isEmpty()) {
throw new IllegalStateException("No requests added");
}
PlcReadRequest plcReadRequest;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 08/10: unneeded import
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5ea1720ce096cd9199f34d9ecbf8510245d8ee67
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:15:58 2018 +1100
unneeded import
---
.../main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java | 1 -
1 file changed, 1 deletion(-)
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 4edf80a..78ebdea 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
@@ -20,7 +20,6 @@ package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
-import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
import java.util.Collections;
import java.util.List;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 06/10: use isEmpty()
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit a0ee2e8127f28229bbb4de8a70a2d2f820f56f84
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:08:47 2018 +1100
use isEmpty()
---
.../plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
index 616d581..1eb03e4 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
@@ -31,7 +31,7 @@ public class TypeSafePlcReadResponse<T> extends PlcReadResponse {
List<? extends ReadResponseItem<?>> responseItems = plcReadResponse.getResponseItems();
Class type = null;
for (ReadResponseItem<?> responseItem : responseItems) {
- if (responseItem.getValues().size() > 0) {
+ if (!responseItem.getValues().isEmpty()) {
type = responseItem.getValues().get(0).getClass();
break;
}
@@ -55,18 +55,20 @@ public class TypeSafePlcReadResponse<T> extends PlcReadResponse {
}
}
+ @Override
@SuppressWarnings("unchecked")
public TypeSafePlcReadRequest<T> getRequest() {
return (TypeSafePlcReadRequest<T>) super.getRequest();
}
+ @Override
@SuppressWarnings("unchecked")
public List<? extends ReadResponseItem<T>> getResponseItems() {
return (List<? extends ReadResponseItem<T>>) super.getResponseItems();
}
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("unchecked")
public Optional<ReadResponseItem<T>> getResponseItem() {
return (Optional<ReadResponseItem<T>>) super.getResponseItem();
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 10/10: add @Overrides
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 52d1979169aea26a5db4316af3d75b08d0c3b9e8
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:16:30 2018 +1100
add @Overrides
---
.../apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java | 1 +
1 file changed, 1 insertion(+)
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 5c21a07..02b66ce 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
@@ -59,6 +59,7 @@ public class TypeSafePlcReadRequest<T> extends PlcReadRequest {
}
}
+ @Override
public void addItem(ReadRequestItem<?> readRequestItem) {
Objects.requireNonNull(readRequestItem);
if (readRequestItem.getDatatype() != dataType) {
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 02/10: unneeded import
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 0eafa629ec045387ce9190542f47c102fac2e6cb
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:07:05 2018 +1100
unneeded import
---
.../src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java | 1 -
1 file changed, 1 deletion(-)
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 cfc6257..418256f 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,7 +21,6 @@ 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.TypeSafePlcReadResponse;
import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest;
import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteResponse;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 09/10: add @Overrides
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit f079d20057c6ce39d270457b6009b1040081e654
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 11:16:20 2018 +1100
add @Overrides
---
.../plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 b05e500..be55148 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
@@ -53,7 +53,8 @@ public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
getRequestItems().add(requestItem);
}
}
-
+
+ @Override
@SuppressWarnings("unchecked")
public void addItem(WriteRequestItem<?> writeRequestItem) {
Objects.requireNonNull(writeRequestItem);
@@ -68,8 +69,8 @@ public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
return (List) getRequestItems();
}
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("unchecked")
public Optional<WriteRequestItem<T>> getRequestItem() {
return (Optional<WriteRequestItem<T>>) super.getRequestItem();
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.