[incubator-plc4x] branch master updated: [General/MODBUS/ADS] Fixed date/time support

2018-09-27 Thread sruehl
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


The following commit(s) were added to refs/heads/master by this push:
 new 4750820  [General/MODBUS/ADS] Fixed date/time support
4750820 is described below

commit 4750820b85638df4f2104159ed02fc4f6f1c3a97
Author: Sebastian Rühl 
AuthorDate: Thu Sep 27 16:38:10 2018 +0200

[General/MODBUS/ADS] Fixed date/time support
---
 .../apache/plc4x/java/ads/model/AdsDataType.java   |  9 ++--
 .../plc4x/java/ads/model/AdsPlcFieldHandler.java   | 58 ++--
 .../ads/protocol/util/LittleEndianDecoder.java |  8 ++-
 .../ads/protocol/util/LittleEndianEncoder.java | 62 +-
 .../java/ads/protocol/Plc4x2AdsProtocolTest.java   | 45 +++-
 .../java/base/messages/DefaultPlcWriteRequest.java |  2 +-
 .../base/protocol/Plc4XSupportedDataTypes.java | 32 +++
 .../java/modbus/netty/Plc4XModbusProtocolTest.java |  1 -
 8 files changed, 168 insertions(+), 49 deletions(-)

diff --git 
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
 
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
index b9859f5..e6cf4c2 100644
--- 
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
+++ 
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsDataType.java
@@ -19,6 +19,9 @@
 package org.apache.plc4x.java.ads.model;
 
 import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 
 /**
  * Documentation can be found here:
@@ -191,15 +194,15 @@ public enum AdsDataType {
  * 
  * TOD#00:00   TOD#1193:02:47.295  32 Bit
  *///TODO: strange maximum
-TIME_OF_DAY(0, 
Duration.ofHours(23).plusMinutes(59).plusSeconds(59).plusMillis(999).toMillis(),
 32),
+TIME_OF_DAY(0, ChronoUnit.MILLIS.between(LocalTime.of(0, 0), 
LocalTime.of(23, 59, 59)), 32),
 /**
  * DATE
  * Date. The most significant digit is one second. The data type is 
handled internally like DWORD.
  * 
  * TypeLower bound Upper bound Memory use
  * DATED#1970-01-01D#2106-02-0632 Bit
- *///TODO: calculate max
-DATE(0, -1, 32),
+ */
+DATE(0, ChronoUnit.SECONDS.between(LocalDateTime.of(1970, 1, 1, 0, 0), 
LocalDateTime.of(2106, 2, 6, 0, 0)), 32),
 /**
  * DATE_AND_TIME
  * DT
diff --git 
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
 
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
index df751cb..bb9be24 100644
--- 
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
+++ 
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java
@@ -27,10 +27,14 @@ import org.apache.plc4x.java.base.messages.items.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 // TODO: implement me acording to ads. currently copy pasta from S7
 // Use endian decoders.
@@ -551,7 +555,7 @@ public class AdsPlcFieldHandler extends 
DefaultPlcFieldHandler {
 case STRUCT:
 case ALIAS:
 case SUB_RANGE_DATA_TYPE:
-return internalEncodeTemporal(field, values);
+return internalTimeTemporal(field, values);
 case UNKNOWN:
 default:
 throw new PlcRuntimeException("Invalid encoder for type " + 
adsField.getAdsDataType().name());
@@ -602,7 +606,7 @@ public class AdsPlcFieldHandler extends 
DefaultPlcFieldHandler {
 case STRUCT:
 case ALIAS:
 case SUB_RANGE_DATA_TYPE:
-return internalEncodeTemporal(field, values);
+return internalDateTemporal(field, values);
 case UNKNOWN:
 default:
 throw new PlcRuntimeException("Invalid encoder for type " + 
adsField.getAdsDataType().name());
@@ -653,7 +657,7 @@ public class AdsPlcFieldHandler extends 
DefaultPlcFieldHandler {
 case STRUCT:
 case ALIAS:
 case SUB_RANGE_DATA_TYPE:
-return internalEncodeTemporal(field, values);
+return internalDateTimeTemporal(field, values);
 case UNKNOWN:
 default:
 throw new PlcRuntimeException("Invalid encoder for type " + 
adsField.getAdsDataType().name());
@@ -930,16 +934,60 @@ public class AdsPlcFieldHandler extends 
DefaultPlcFieldHandler {
 return new 

[incubator-plc4x] 04/07: [General] SingleItemToSingleRequestProtocol small Bugfixes

2018-09-27 Thread sruehl
This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch feature/TopLevelItemSpliting
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 33e754b13510535209080878167c0534f6c49f03
Author: Sebastian Rühl 
AuthorDate: Wed Sep 26 18:23:42 2018 +0200

[General] SingleItemToSingleRequestProtocol small Bugfixes
---
 .../java/base/protocol/SingleItemToSingleRequestProtocol.java| 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 0fdebf5..717b4dc 100644
--- 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -48,7 +48,7 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 
 private ConcurrentMap, Set> 
containerCorrelationIdMap;
 
-private ConcurrentMap, 
List>> responsesToBeDevliered;
+private ConcurrentMap, 
List>> responsesToBeDelivered;
 
 private AtomicInteger correlationId;
 
@@ -57,6 +57,7 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 this.queue = new PendingWriteQueue(ctx);
 this.sentButUnacknowledgedRequestItems = new ConcurrentHashMap<>();
 this.containerCorrelationIdMap = new ConcurrentHashMap<>();
+this.responsesToBeDelivered = new ConcurrentHashMap<>();
 this.correlationId = new AtomicInteger();
 super.channelRegistered(ctx);
 }
@@ -83,7 +84,7 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 if (plcRequestContainer == null) {
 throw new PlcRuntimeException("Unrelated package received " + msg);
 }
-List> correlatedResponseItems = 
responsesToBeDevliered.computeIfAbsent(plcRequestContainer, ignore -> new 
LinkedList<>());
+List> correlatedResponseItems = 
responsesToBeDelivered.computeIfAbsent(plcRequestContainer, ignore -> new 
LinkedList<>());
 correlatedResponseItems.add(msg);
 Set integers = 
containerCorrelationIdMap.get(plcRequestContainer);
 integers.remove(correlationId);
@@ -113,7 +114,7 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 throw new PlcRuntimeException("Unknown type detected " + 
plcRequestContainer.getRequest());
 }
 plcRequestContainer.getResponseFuture().complete(plcResponse);
-responsesToBeDevliered.remove(plcRequestContainer);
+responsesToBeDelivered.remove(plcRequestContainer);
 }
 }
 
@@ -144,7 +145,6 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 
 if (internalPlcFieldRequest instanceof InternalPlcReadRequest) 
{
 InternalPlcReadRequest internalPlcReadRequest = 
(InternalPlcReadRequest) internalPlcFieldRequest;
-// TODO: repackage
 internalPlcReadRequest.getNamedFields().forEach(field -> {
 ChannelPromise subPromise = new 
DefaultChannelPromise(promise.channel());
 
@@ -167,7 +167,6 @@ public class SingleItemToSingleRequestProtocol extends 
ChannelDuplexHandler {
 }
 if (internalPlcFieldRequest instanceof 
InternalPlcWriteRequest) {
 InternalPlcWriteRequest internalPlcWriteRequest = 
(InternalPlcWriteRequest) internalPlcFieldRequest;
-// TODO: repackage
 
internalPlcWriteRequest.getNamedFieldTriples().forEach(fieldItemTriple -> {
 ChannelPromise subPromise = new 
DefaultChannelPromise(promise.channel());
 



[incubator-plc4x] branch feature/TopLevelItemSpliting updated (86041d3 -> 5951fc5)

2018-09-27 Thread sruehl
This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a change to branch feature/TopLevelItemSpliting
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


 discard 86041d3  [General] SingleItemToSingleRequestProtocol replace throwing 
of   RuntimeExceptions with log statements.
 discard bd66350  [General] SingleItemToSingleRequestProtocol added abstract 
javadoc
 discard d3844ed  [General] SingleItemToSingleRequestProtocol small Bugfixes
 discard 9e25460  [General] SingleItemToSingleRequestProtocol implemented 
ErrorHandler
 discard be82ba7  [General] some progress on the 
SingleItemToSingleRequestProtocol
 discard 10cf16a  Introduced protocol layer to split requestItems to several 
requests.
 add f9707df  PLC4X-60 - Fix findings by the last release
 add ee88f24  PLC4X-60 - Fix findings by the last release
 add b482930  PLC4X-60 - Fix findings by the last release
 add e292f32  PLC4X-60 - Fix findings by the last release
 add e31e741  PLC4X-56 - [S7] S7Field does not recognize addresses with 
numElements present
 add 374fd74  PLC4X-56 - [S7] S7Field does not recognize addresses with 
numElements present
 add d57e7ea  PLC4X-54 - Installation Process isn't working SSL Errors
 add 776f2b7  PLC4X-56 - [S7] S7Field does not recognize addresses with 
numElements present
 add d594ff6  [General] updated mockito and added assertj for easier 
testing.
 new 3d7494f  Introduced protocol layer to split requestItems to several 
requests.
 new a53cbbf  [General] some progress on the 
SingleItemToSingleRequestProtocol
 new 5afff50  [General] SingleItemToSingleRequestProtocol implemented 
ErrorHandler
 new 33e754b  [General] SingleItemToSingleRequestProtocol small Bugfixes
 new e36b6b2  [General] SingleItemToSingleRequestProtocol added abstract 
javadoc
 new 6703953  [General] SingleItemToSingleRequestProtocol replace throwing 
of   RuntimeExceptions with log statements.
 new 5951fc5  [General] SingleItemToSingleRequestProtocol fixed a bunch of 
bugs and added tests

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (86041d3)
\
 N -- N -- N   refs/heads/feature/TopLevelItemSpliting (5951fc5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 7 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:
 .../google/src/remote-resources/META-INF/LICENSE   |5 +
 mvnw.cmd   |2 +-
 plc4j/protocols/driver-bases/base/pom.xml  |5 +
 .../SingleItemToSingleRequestProtocol.java |  125 ++-
 .../SingleItemToSingleRequestProtocolTest.java |  290 ++
 plc4j/protocols/driver-bases/test/pom.xml  |6 +
 .../org/apache/plc4x/java/s7/model/S7Field.java|4 +-
 .../org/apache/plc4x/java/issues/PLC4X56.java} |   46 +-
 .../rawsockets/netty/AbstractRawSocketChannel.java |  740 --
 .../netty/AbstractRawSocketStreamChannel.java  | 1042 
 .../utils/rawsockets/netty/RawSocketChannel.java   |  133 ---
 .../rawsockets/netty/RawSocketChannelConfig.java   |  187 
 .../rawsockets/netty/RawSocketChannelSav.java  |  186 
 .../rawsockets/netty/RawSocketEventArray.java  |  104 --
 .../utils/rawsockets/netty/RawSocketEventLoop.java |  449 -
 .../src/remote-resources/META-INF/LICENSE  |9 +
 .../src/remote-resources/META-INF/NOTICE   |4 +
 pom.xml|   66 +-
 src/site/asciidoc/developers/release.adoc  |   79 +-
 .../ads/index.adoc => users/download.adoc} |   13 +-
 src/site/site.xml  |2 +
 21 files changed, 568 insertions(+), 2929 deletions(-)
 create mode 100644 examples/google/src/remote-resources/META-INF/LICENSE
 create mode 100644 
plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
 copy 
plc4j/protocols/s7/src/{main/java/org/apache/plc4x/java/s7/messages/items/S7LocalDateTimeFieldItem.java
 => test/java/org/apache/plc4x/java/issues/PLC4X56.java} (52%)
 delete mode 100644 

[incubator-plc4x] 02/07: [General] some progress on the SingleItemToSingleRequestProtocol

2018-09-27 Thread sruehl
This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch feature/TopLevelItemSpliting
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit a53cbbf8e022409ef4c3aaa79c93b029e39375bf
Author: Sebastian Rühl 
AuthorDate: Wed Sep 26 18:01:46 2018 +0200

[General] some progress on the SingleItemToSingleRequestProtocol
---
 .../base/messages/item/CorrelatedRequestItem.java  |  81 
 .../base/messages/item/CorrelatedResponseItem.java |  70 ---
 .../SingleItemToSingleRequestProtocol.java | 217 +++--
 3 files changed, 153 insertions(+), 215 deletions(-)

diff --git 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedRequestItem.java
 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedRequestItem.java
deleted file mode 100644
index 5212618..000
--- 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedRequestItem.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-package org.apache.plc4x.java.base.messages.item;
-
-import org.apache.plc4x.java.api.messages.PlcRequestContainer;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.api.messages.items.RequestItem;
-
-import java.util.Objects;
-
-public class CorrelatedRequestItem> {
-
-private final int correlationId;
-
-private final REQUEST_ITEM requestItem;
-
-private final PlcRequestContainer> 
plcRequestContainer;
-
-public CorrelatedRequestItem(int correlationId, REQUEST_ITEM requestItem, 
PlcRequestContainer> plcRequestContainer) {
-this.correlationId = correlationId;
-this.requestItem = requestItem;
-this.plcRequestContainer = plcRequestContainer;
-}
-
-public int getCorrelationId() {
-return correlationId;
-}
-
-public REQUEST_ITEM getRequestItem() {
-return requestItem;
-}
-
-public PlcRequestContainer> 
getPlcRequestContainer() {
-return plcRequestContainer;
-}
-
-@Override
-public boolean equals(Object o) {
-if (this == o) {
-return true;
-}
-if (!(o instanceof CorrelatedRequestItem)) {
-return false;
-}
-CorrelatedRequestItem that = (CorrelatedRequestItem) o;
-return correlationId == that.correlationId &&
-Objects.equals(requestItem, that.requestItem) &&
-Objects.equals(plcRequestContainer, that.plcRequestContainer);
-}
-
-@Override
-public int hashCode() {
-
-return Objects.hash(correlationId, requestItem, plcRequestContainer);
-}
-
-@Override
-public String toString() {
-return "CorrelatedRequestItem{" +
-"correlationId=" + correlationId +
-", requestItem=" + requestItem +
-", plcRequestContainer=" + plcRequestContainer +
-'}';
-}
-}
diff --git 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedResponseItem.java
 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedResponseItem.java
deleted file mode 100644
index 38a9032..000
--- 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/item/CorrelatedResponseItem.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions 

[incubator-plc4x] 05/07: [General] SingleItemToSingleRequestProtocol added abstract javadoc

2018-09-27 Thread sruehl
This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch feature/TopLevelItemSpliting
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit e36b6b2650b839b42c07f958f7b8b181457fa6fe
Author: Sebastian Rühl 
AuthorDate: Wed Sep 26 18:25:14 2018 +0200

[General] SingleItemToSingleRequestProtocol added abstract javadoc
---
 .../plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java| 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
index 717b4dc..2ab0937 100644
--- 
a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
+++ 
b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
@@ -37,6 +37,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+/**
+ * This layer can be used to split a {@link 
org.apache.plc4x.java.api.messages.PlcRequest} which addresses multiple {@link 
PlcField}s into multiple subsequent {@link 
org.apache.plc4x.java.api.messages.PlcRequest}s.
+ */
 // TODO: write test
 public class SingleItemToSingleRequestProtocol extends ChannelDuplexHandler {
 



[incubator-plc4x] branch master updated: [General] updated mockito and added assertj for easier testing.

2018-09-27 Thread sruehl
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


The following commit(s) were added to refs/heads/master by this push:
 new d594ff6  [General] updated mockito and added assertj for easier 
testing.
d594ff6 is described below

commit d594ff64a9e4df30f7d92b6ab8c781f9b298e5e8
Author: Sebastian Rühl 
AuthorDate: Thu Sep 27 12:15:05 2018 +0200

[General] updated mockito and added assertj for easier testing.
---
 plc4j/protocols/driver-bases/base/pom.xml |  5 +
 plc4j/protocols/driver-bases/test/pom.xml |  6 ++
 pom.xml   | 26 --
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/plc4j/protocols/driver-bases/base/pom.xml 
b/plc4j/protocols/driver-bases/base/pom.xml
index 82c90c0..66753a7 100644
--- a/plc4j/protocols/driver-bases/base/pom.xml
+++ b/plc4j/protocols/driver-bases/base/pom.xml
@@ -65,6 +65,11 @@
   logback-classic
   test
 
+
+  org.assertj
+  assertj-core
+  3.9.1
+
   
 
 
\ No newline at end of file
diff --git a/plc4j/protocols/driver-bases/test/pom.xml 
b/plc4j/protocols/driver-bases/test/pom.xml
index 830ea1b..e70cd2c 100644
--- a/plc4j/protocols/driver-bases/test/pom.xml
+++ b/plc4j/protocols/driver-bases/test/pom.xml
@@ -73,6 +73,12 @@
   compile
 
 
+  org.mockito
+  mockito-junit-jupiter
+  
+  compile
+
+
   commons-io
   commons-io
 
diff --git a/pom.xml b/pom.xml
index 85fcfc2..b4b2867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,8 @@
 5.2.0
 1.2.0
 1.2.3
-2.13.0
+2.22.0
+3.11.1
 4.1.23.Final
 1.7.3
 1.7.25
@@ -245,6 +246,17 @@
 ${mockito.version}
   
   
+org.mockito
+mockito-junit-jupiter
+${mockito.version}
+  
+  
+org.assertj
+assertj-core
+${assertj.version}
+test
+  
+  
 org.slf4j
 slf4j-api
 ${slf4j.version}
@@ -1051,7 +1063,16 @@
 
   org.mockito
   mockito-core
-  2.13.0
+  test
+
+
+  org.mockito
+  mockito-junit-jupiter
+  test
+
+
+  org.assertj
+  assertj-core
   test
 
   
@@ -1089,6 +1110,7 @@
 
org.hamcrest:hamcrest-core
 
org.hamcrest:hamcrest-library
 
org.mockito:mockito-core
+
org.mockito:mockito-junit-jupiter
 org.slf4j:slf4j-api
 
ch.qos.logback:logback-classic
   



[incubator-plc4x] branch master updated (d594ff6 -> b2f0fa3)

2018-09-27 Thread sruehl
This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


from d594ff6  [General] updated mockito and added assertj for easier 
testing.
 add 3d7494f  Introduced protocol layer to split requestItems to several 
requests.
 add a53cbbf  [General] some progress on the 
SingleItemToSingleRequestProtocol
 add 5afff50  [General] SingleItemToSingleRequestProtocol implemented 
ErrorHandler
 add 33e754b  [General] SingleItemToSingleRequestProtocol small Bugfixes
 add e36b6b2  [General] SingleItemToSingleRequestProtocol added abstract 
javadoc
 add 6703953  [General] SingleItemToSingleRequestProtocol replace throwing 
of   RuntimeExceptions with log statements.
 add 327cc6f  [General] updated mockito and added assertj for easier 
testing.
 add b2f0fa3  [MODBUS/ADS] Integrate SingleItemToSingleRequestProtocol for 
now

No new revisions were added by this update.

Summary of changes:
 .../ads/connection/AdsSerialPlcConnection.java |   2 +
 .../java/ads/connection/AdsTcpPlcConnection.java   |   2 +
 .../SingleItemToSingleRequestProtocol.java | 335 +
 .../SingleItemToSingleRequestProtocolTest.java | 290 ++
 .../modbus/connection/ModbusTcpPlcConnection.java  |   2 +
 .../plc4x/java/modbus/ManualPlc4XModbusTest.java   |  32 ++
 6 files changed, 663 insertions(+)
 create mode 100644 
plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
 create mode 100644 
plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java