You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2018/01/14 21:41:23 UTC
[incubator-plc4x] branch PLC4X-12 updated (6f6f00a -> 6bb9315)
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 6f6f00a Merge branch 'master' into PLC4X-12
add 5744cc3 use a checked List to avoid injection of wrong types.
add 113080f use Optional and get rid of unchecked warnings
add c9ed5f1 remove unused import
add 8a8968a small fixes: - added SafeVarargs where required - remove unnecessary SuppressWarnings - make build methods final - fixed typos
add bf41fd4 don't use optional::get without checking
add 7b771a1 added todo about declarative pipeline
add 8005b55 remove warning about unused cast
add 3bd16f5 Small improvements on IsoTPProtocolTest - get rid of Mock implementation in favor of Mockito DeepStubs - remove duplicated code by making common used items members - apply builder pattern to buffer
add 5886538 fixed timing issues on get responseItem by signaling after item has been set not before.
add 36d151f Put the await into a while loop to handle "spurious wakeup"
add 80b2ba5 no need to wrap PlcException in RuntimeException as camel allows Producer constructors to throw exceptions
add 8940cb4 log expection on connection close failure
add 37afedb transport the inner exception in PlcConnectionException
add 5dd6ab5 use parseInt instead of valueOf
add e3a7d29 use specific exceptions
add b8c0b06 fix wrong scope. Meant to be optional true
add e596961 fixed wrong default reporting path as this variable already contains target
add 38e344e fix missing coverage by switching to junit5 and make test compatible
add e1d1bb8 added some test coverage to camel-component
add 97070a1 added missing apache header
add 91df3f7 remove unused getters
add 909fd38 added some branch coverage on plc4x producer
add a8708c3 added tests for default methods
add d322d6e Added tests for (Typed)Request/Repsonses
add ef8c3d4 added one missing testcase for typed read response
add e9d0fab no need for empty constructor
add d88234a refactor to reduce complexity
add 3bf2fc7 add NOTICE file for source
add 14952b8 add incubating disclaimer
add 0e3decf wrap DISCLAIMER
add 8d1f2a5 Remove response in RequestItem
new 2f70356 Merge branch 'master' into PLC4X-12
add 03239bd remove unneeded imports
add c6c50b1 fix logging so no side effects
add 79e26cd custom Tpdu message - use in test but may also be useful
add 74f4140 added unknown tdpu code
add 716ac61 fix logging so no side effects
add eb07a1b add a couple of bad path tests for unsupported tpdu codes
add 9fad062 now UNKNOWN rather than null adn null can give rise to NPEs
add 1c831ad fix logging so no side effects
add 8261951 remove unnecessary locks
add bf90e53 remove unnecessary imports
new fefa595 Merge branch 'master' into PLC4X-12
new 6bb9315 WIP: Merged changes from master
The 3 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:
DISCLAIMER | 7 +
Jenkinsfile | 1 +
NOTICE | 8 +
integrations/apache-camel/pom.xml | 29 +-
.../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 10 +-
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 13 +-
.../java/org/apache/plc4x/camel/ConstantsTest.java | 25 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 22 +-
.../org/apache/plc4x/camel/PLC4XEndpointTest.java | 35 +-
.../org/apache/plc4x/camel/PLC4XProducerTest.java | 111 +++++
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 13 +-
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 14 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 13 +-
.../apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 16 +-
.../java/api/messages/items/ReadRequestItem.java | 2 +-
.../java/api/messages/items/ReadResponseItem.java | 1 -
.../plc4x/java/api/messages/items/RequestItem.java | 44 +-
.../java/api/messages/items/WriteRequestItem.java | 12 +-
.../java/api/messages/items/WriteResponseItem.java | 1 -
.../messages/specific/TypeSafePlcReadRequest.java | 1 +
.../messages/specific/TypeSafePlcWriteRequest.java | 19 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 36 ++
.../plc4x/java/api/connection/PlcWriterTest.java | 36 ++
.../plc4x/java/api/messages/APIMessageTests.java | 56 ---
.../java/api/messages/PlcReadRequestTest.java | 88 ++++
.../java/api/messages/PlcReadResponseTest.java | 45 ++
.../plc4x/java/api/messages/PlcRequestTest.java | 86 ++++
.../plc4x/java/api/messages/PlcResponseTest.java | 87 ++++
.../java/api/messages/PlcWriteRequestTest.java | 86 ++++
.../java/api/messages/PlcWriteResponseTest.java | 45 ++
.../specific/TypeSafePlcReadRequestTest.java | 77 ++++
.../specific/TypeSafePlcReadResponseTest.java | 76 ++++
.../specific/TypeSafePlcWriteRequestTest.java | 77 ++++
.../specific/TypeSafePlcWriteResponseTest.java | 62 +++
.../org/apache/plc4x/java/PlcDriverManager.java | 2 +-
.../apache/plc4x/java/s7/utils/PcapGenerator.java | 22 +-
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 45 +-
.../java/isotp/netty/model/tpdus/CustomTpdu.java | 15 +
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 7 +-
.../java/isotp/netty/model/types/TpduCode.java | 8 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 444 +++++++++++---------
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 356 +++++++++-------
.../java/s7/netty/model/messages/S7Message.java | 13 +-
.../netty/model/params/CpuServicesParameter.java | 4 -
.../netty/model/types/DataTransportErrorCode.java | 9 +-
.../java/s7/netty/model/types/ParameterType.java | 7 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 460 +++++++++------------
.../apache/plc4x/java/isotp/netty/MockChannel.java | 243 -----------
.../isotp/netty/MockChannelHandlerContext.java | 234 -----------
.../java/isotp/netty/MockChannelPipeline.java | 354 ----------------
.../isotp/netty/model/tpdus/IsotpModelTests.java | 8 +-
.../isotp/netty/model/types/IsotpTypeTests.java | 5 +-
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 4 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 4 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 4 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 4 +-
.../s7/netty/model/messages/S7MessageTests.java | 8 +-
.../api/connection/PlcMessageConversions.scala | 34 +-
.../plc4x/scala/api/connection/PlcReader.scala | 3 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 21 +-
.../plc4x/scala/api/messages/items/PlcItems.scala | 28 +-
pom.xml | 4 +-
65 files changed, 1883 insertions(+), 1731 deletions(-)
create mode 100644 DISCLAIMER
create mode 100644 NOTICE
copy plc4j/api/src/test/java/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java => integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java (58%)
copy plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/netty/events/S7StateTests.java => integrations/apache-camel/src/test/java/org/apache/plc4x/camel/PLC4XEndpointTest.java (53%)
create mode 100644 integrations/apache-camel/src/test/java/org/apache/plc4x/camel/PLC4XProducerTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcReaderTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadRequestTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcReadResponseTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcResponseTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteRequestTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcWriteResponseTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequestTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponseTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequestTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponseTest.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/CustomTpdu.java
delete mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannel.java
delete mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannelHandlerContext.java
delete mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannelPipeline.java
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 03/03: WIP: Merged changes from master
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 6bb931583f3246c5773f1d26906a9421f749d7e6
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Sun Jan 14 22:41:16 2018 +0100
WIP: Merged changes from master
---
.../api/connection/PlcMessageConversions.scala | 34 ++++++++++++----------
.../plc4x/scala/api/connection/PlcReader.scala | 3 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 21 +++++++------
.../plc4x/scala/api/messages/items/PlcItems.scala | 28 +++++++++++++-----
4 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
index b28ee37..ecaf83b 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
@@ -18,49 +18,53 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import scala.collection.JavaConverters._
-import org.apache.plc4x.java.api.messages.{PlcReadRequest => jPlcReadRequest, PlcReadResponse => jPlcReadResponse}
import org.apache.plc4x.java.api.messages.items.{ReadRequestItem => jReadRequestItem, ReadResponseItem => jReadResponseItem}
+import org.apache.plc4x.java.api.messages.{PlcReadRequest => jPlcReadRequest, PlcReadResponse => jPlcReadResponse}
import org.apache.plc4x.scala.api.messages.items.{ReadRequestItem, ReadResponseItem}
import org.apache.plc4x.scala.api.messages.{PlcReadRequest, PlcReadResponse}
+import scala.collection.JavaConverters._
private[connection] object PlcMessageConversions {
- implicit class requestItemOps(item: ReadRequestItem){
+ implicit class requestItemOps(item: ReadRequestItem[_]){
- def toJava: jReadRequestItem = new jReadRequestItem(item.datatype, item.address, item.size)
+ def toJava: jReadRequestItem[_] = new jReadRequestItem(item.datatype, item.address, item.size)
}
- implicit class jRequestItemOps(item: jReadRequestItem){
+ implicit class jRequestItemOps(item: jReadRequestItem[_]){
- def toScala: ReadRequestItem = new ReadRequestItem(item.getDatatype(), item.getAddress(), item.getSize())
+ def toScala: ReadRequestItem[_] = new ReadRequestItem(item.getDatatype, item.getAddress, item.getSize)
}
implicit class RequestOps(req: PlcReadRequest) {
- def toJava: jPlcReadRequest = new jPlcReadRequest(req.readRequestItems.map(e => e.toJava).asJava)
+ def toJava: jPlcReadRequest = new jPlcReadRequest(req.readRequestItems.map(_.toJava).asJava)
}
implicit class jRequestOps(req: jPlcReadRequest) {
- def toScala: PlcReadRequest = PlcReadRequest(req.getReadRequestItems().asScala.map(e => e.toScala).toList)
+ def toScala: PlcReadRequest = PlcReadRequest(req.getRequestItems.asScala.map(e => e.toScala).toList)
}
- implicit class jResponseItemOps(item: jReadResponseItem){
+ implicit class jResponseItemOps(item: jReadResponseItem[_]){
- def toScala: ReadResponseItem =
- ReadResponseItem(item.getRequestItem().toScala, item.getResponseCode(), item.getValues().asScala.toList)
+ def toScala: ReadResponseItem[_] = ReadResponseItem(
+ item.getRequestItem.toScala.asInstanceOf[ReadRequestItem[Any]], item.getResponseCode,
+ item.getValues.asScala.toList)
}
- implicit class responseItemOps(item: ReadResponseItem){
+ implicit class responseItemOps(item: ReadResponseItem[_]){
- def toJava: jReadResponseItem =
- new jReadResponseItem(item.readRequestItem.toJava, item.responseCode, item.values.asJava)
+ def toJava: jReadResponseItem[_] =
+ new jReadResponseItem(item.readRequestItem.toJava.asInstanceOf[jReadRequestItem[Any]],
+ item.responseCode, item.values.asJava.asInstanceOf[java.util.List[Any]])
}
implicit class ResponseOps(resp: jPlcReadResponse) {
def toScala: PlcReadResponse =
- PlcReadResponse(resp.getRequest().toScala, resp.getResponseItems().asScala.map(e => e.toScala).toList)
+ PlcReadResponse(resp.getRequest.toScala,
+ resp.getResponseItems.asScala.toList.map(x => x.toScala))
+
}
}
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
index 4129098..0a2a600 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
@@ -36,10 +36,9 @@ trait PlcReader {
* Reads a requested value from a PLC.
*
* @param readRequest object describing the type and location of the value.
- * @tparam T The value type that should be used.
* @return a [[Future]] giving async access to the returned value.
*/
- def read[T](readRequest: PlcReadRequest)(implicit ec: ExecutionContext): Future[PlcReadResponse] =
+ def read(readRequest: PlcReadRequest)(implicit ec: ExecutionContext): Future[PlcReadResponse] =
reader.read(readRequest.toJava).toScala.map { _.toScala }
}
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
index a27c9ea..f4ec52d 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
@@ -19,29 +19,32 @@ under the License.
package org.apache.plc4x.scala.api.messages
import org.apache.plc4x.java.api.model.Address
-import items.{ReadRequestItem, ReadResponseItem}
-
+import items.{ReadRequestItem, ReadResponseItem, RequestItem, ResponseItem}
import scala.collection.immutable.List
sealed trait PlcMessage
-sealed trait PlcRequest extends PlcMessage
+sealed trait PlcRequest[REQUEST_ITEM <: RequestItem[_]] extends PlcMessage
+
+final case class PlcReadRequest(readRequestItems: List[ReadRequestItem[_]])
+ extends PlcRequest[ReadRequestItem[_]]{
-final case class PlcReadRequest(readRequestItems: List[ReadRequestItem]){
- def addItem(item: ReadRequestItem) = PlcReadRequest(item::readRequestItems)
+ def addItem(item: ReadRequestItem[_]) = PlcReadRequest(item::readRequestItems)
def getNumItems = readRequestItems.size
}
object PlcReadRequest{
def apply(): PlcReadRequest =
- PlcReadRequest(List[ReadRequestItem]())
- def apply(readRequestItems: List[ReadRequestItem]): PlcReadRequest =
+ PlcReadRequest(List[ReadRequestItem[_]]())
+ def apply(readRequestItems: List[ReadRequestItem[_]]): PlcReadRequest =
PlcReadRequest(readRequestItems)
def apply(datatype: Class[_], address: Address, size: Int = 1): PlcReadRequest =
PlcReadRequest(List(ReadRequestItem(datatype, address, size)))
}
-sealed trait PlcResponse extends PlcMessage
+sealed trait PlcResponse[REQUEST <: PlcRequest[_], RESPONSE_ITEM <: ResponseItem[_], REQUEST_ITEM <: RequestItem[_]]
+ extends PlcMessage
-final case class PlcReadResponse(readRequest: PlcReadRequest, responseItems: List[ReadResponseItem])
+final case class PlcReadResponse(readRequest: PlcReadRequest, responseItems: List[_ <: ReadResponseItem[_]])
+ extends PlcResponse[PlcReadRequest, ReadResponseItem[_], ReadRequestItem[_]]
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
index 4b0962f..81210d7 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
@@ -20,18 +20,30 @@ package org.apache.plc4x.scala.api.messages.items
import org.apache.plc4x.java.api.model.Address
import org.apache.plc4x.java.api.types.ResponseCode
+
import scala.collection.immutable.List
-case class ReadRequestItem(datatype: Class[_], address: Address, size: Int)
-object ReadRequestItem{
- def apply(datatype: Class[_], address: Address, size: Int): ReadRequestItem =
+trait RequestItem[D]
+
+case class ReadRequestItem[D](datatype: Class[D],
+ address: Address,
+ size: Int) extends RequestItem[D]
+
+object ReadRequestItem {
+ def apply[D](datatype: Class[D], address: Address, size: Int) =
new ReadRequestItem(datatype, address, size)
- def apply(datatype: Class[_], address: Address): ReadRequestItem =
+
+ def apply[D](datatype: Class[D], address: Address) =
new ReadRequestItem(datatype, address, size = 1)
}
-case class ReadResponseItem(readRequestItem: ReadRequestItem, responseCode: ResponseCode, values: List[AnyRef])
-object ReadResponseItem{
- def apply(readRequestItem: ReadRequestItem, responseCode: ResponseCode, values: List[AnyRef]): ReadResponseItem =
+trait ResponseItem[REQUEST_ITEM <: RequestItem[_]]
+
+case class ReadResponseItem[D](readRequestItem: ReadRequestItem[D],
+ responseCode: ResponseCode,
+ values: List[D]) extends ResponseItem[ReadRequestItem[D]]
+
+object ReadResponseItem {
+ def apply[D](readRequestItem: ReadRequestItem[D], responseCode: ResponseCode, values: List[D]) =
new ReadResponseItem(readRequestItem, responseCode, values)
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 01/03: Merge branch 'master' into PLC4X-12
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 2f70356b7bd0fbc011f9a68902c544d8685dda26
Merge: 6f6f00a 8d1f2a5
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Sat Jan 13 22:41:07 2018 +0100
Merge branch 'master' into PLC4X-12
DISCLAIMER | 7 +
Jenkinsfile | 1 +
NOTICE | 8 +
integrations/apache-camel/pom.xml | 29 +-
.../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 10 +-
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 13 +-
.../java/org/apache/plc4x/camel/ConstantsTest.java | 43 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 22 +-
.../org/apache/plc4x/camel/PLC4XEndpointTest.java | 52 +++
.../org/apache/plc4x/camel/PLC4XProducerTest.java | 111 ++++++
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 13 +-
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 14 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 13 +-
.../apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 16 +-
.../java/api/messages/items/ReadRequestItem.java | 2 +-
.../java/api/messages/items/ReadResponseItem.java | 1 -
.../plc4x/java/api/messages/items/RequestItem.java | 33 +-
.../java/api/messages/items/WriteRequestItem.java | 12 +-
.../java/api/messages/items/WriteResponseItem.java | 1 -
.../messages/specific/TypeSafePlcReadRequest.java | 1 +
.../messages/specific/TypeSafePlcWriteRequest.java | 19 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 36 ++
.../plc4x/java/api/connection/PlcWriterTest.java | 36 ++
.../plc4x/java/api/messages/APIMessageTests.java | 56 ---
.../java/api/messages/PlcReadRequestTest.java | 88 ++++
.../java/api/messages/PlcReadResponseTest.java | 45 +++
.../plc4x/java/api/messages/PlcRequestTest.java | 86 ++++
.../plc4x/java/api/messages/PlcResponseTest.java | 87 ++++
.../java/api/messages/PlcWriteRequestTest.java | 86 ++++
.../java/api/messages/PlcWriteResponseTest.java | 45 +++
.../specific/TypeSafePlcReadRequestTest.java | 77 ++++
.../specific/TypeSafePlcReadResponseTest.java | 76 ++++
.../specific/TypeSafePlcWriteRequestTest.java | 77 ++++
.../specific/TypeSafePlcWriteResponseTest.java | 62 +++
.../org/apache/plc4x/java/PlcDriverManager.java | 2 +-
.../apache/plc4x/java/s7/utils/PcapGenerator.java | 22 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 20 +-
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 7 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 444 ++++++++++++---------
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 354 ++++++++--------
.../java/s7/netty/model/messages/S7Message.java | 13 +-
.../netty/model/params/CpuServicesParameter.java | 4 -
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 438 +++++++++-----------
.../apache/plc4x/java/isotp/netty/MockChannel.java | 243 -----------
.../isotp/netty/MockChannelHandlerContext.java | 234 -----------
.../java/isotp/netty/MockChannelPipeline.java | 354 ----------------
.../isotp/netty/model/tpdus/IsotpModelTests.java | 8 +-
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 4 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 4 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 4 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 4 +-
.../s7/netty/model/messages/S7MessageTests.java | 8 +-
pom.xml | 4 +-
55 files changed, 1787 insertions(+), 1668 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 02/03: Merge branch 'master' into PLC4X-12
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit fefa5952d3dcd55b1dcb1384bfbe0785231159ba
Merge: 2f70356 bf90e53
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Sun Jan 14 18:29:51 2018 +0100
Merge branch 'master' into PLC4X-12
.../plc4x/java/api/messages/items/RequestItem.java | 11 ----------
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +++-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 25 +++++++++++++++-------
.../java/isotp/netty/model/tpdus/CustomTpdu.java | 15 +++++++++++++
.../java/isotp/netty/model/types/TpduCode.java | 8 +++++--
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 8 +++++--
.../netty/model/types/DataTransportErrorCode.java | 9 ++++++--
.../java/s7/netty/model/types/ParameterType.java | 7 +++++-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 22 +++++++++++++++++++
.../isotp/netty/model/types/IsotpTypeTests.java | 5 +++--
10 files changed, 85 insertions(+), 29 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.