You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/09/10 16:20:22 UTC

[incubator-plc4x] 08/08: Merge branch 'feature/api-redesign-chris-c' of https://github.com/skorikov/incubator-plc4x into skorikov-feature/api-redesign-chris-c

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch skorikov-feature/api-redesign-chris-c
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit aff5bb300684f60032a7722482b9a0bc9f111069
Merge: 398f4b9 955ad74
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Sep 10 18:17:50 2018 +0200

    Merge branch 'feature/api-redesign-chris-c' of https://github.com/skorikov/incubator-plc4x into skorikov-feature/api-redesign-chris-c

 .../org/apache/plc4x/kafka/Plc4xSinkConnector.java |  41 +++--
 .../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 101 +++++++++++
 .../apache/plc4x/kafka/Plc4xSourceConnector.java   |  50 ++++--
 .../org/apache/plc4x/kafka/Plc4xSourceTask.java    | 197 +++++++++++++++++++++
 .../org/apache/plc4x/kafka/common/Plc4xConfig.java |  92 ----------
 .../apache/plc4x/kafka/sink/Plc4xSinkConfig.java   |  49 -----
 .../org/apache/plc4x/kafka/sink/Plc4xSinkTask.java | 119 -------------
 .../plc4x/kafka/source/Plc4xSourceConfig.java      |  49 -----
 .../apache/plc4x/kafka/source/Plc4xSourceTask.java | 133 --------------
 .../org/apache/plc4x/kafka/util/VersionUtil.java   |   2 +-
 .../apache/plc4x/kafka/Plc4XSinkConfigTest.java    |  31 ----
 .../apache/plc4x/kafka/Plc4XSourceConfigTest.java  |  31 ----
 plc4j/protocols/pom.xml                            |   2 +-
 .../org/apache/plc4x/java/test/TestDevice.java     |   7 +-
 .../java/org/apache/plc4x/java/test/TestField.java |   5 +
 .../java/org/apache/plc4x/java/test/TestType.java  |   3 +-
 16 files changed, 371 insertions(+), 541 deletions(-)