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/07 12:29:48 UTC

[incubator-plc4x] 01/01: Refactored the recent additions to master - Google IoT Example - Kakfka-Connect integration - Test driver

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

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

commit a396de44717ffc7c3850b837f4a3f99cc997f211
Merge: 4be6686 42ddef9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Sep 7 14:29:44 2018 +0200

    Refactored the recent additions to master
    - Google IoT Example
    - Kakfka-Connect integration
    - Test driver

 examples/google/README.md                          |  61 +++++
 examples/google/pom.xml                            | 129 +++++++++
 .../google/iotcore/MqttExampleOptions.java         | 166 ++++++++++++
 .../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 292 +++++++++++++++++++++
 .../google/src/main/resources/logback.xml          |  46 ++--
 examples/pom.xml                                   |   1 +
 integrations/apache-kafka/README.md                |  52 ++++
 integrations/apache-kafka/bin/debug.sh             |  29 ++
 .../config/Plc4xSinkConnector.properties           |  23 ++
 .../config/Plc4xSourceConnector.properties         |  21 ++
 .../config/connect-avro-docker.properties          |  44 ++++
 integrations/apache-kafka/docker-compose.yml       |  45 ++++
 integrations/apache-kafka/pom.xml                  | 103 ++++++++
 .../apache-kafka/src/main/assembly/package.xml     |  59 +++++
 .../org/apache/plc4x/kafka/Plc4xSinkConnector.java |  74 ++++++
 .../apache/plc4x/kafka/Plc4xSourceConnector.java   |  74 ++++++
 .../org/apache/plc4x/kafka/common/Plc4xConfig.java |  92 +++++++
 .../apache/plc4x/kafka/sink/Plc4xSinkConfig.java   |  49 ++++
 .../org/apache/plc4x/kafka/sink/Plc4xSinkTask.java | 129 +++++++++
 .../plc4x/kafka/source/Plc4xSourceConfig.java      |  49 ++++
 .../apache/plc4x/kafka/source/Plc4xSourceTask.java | 140 ++++++++++
 .../org/apache/plc4x/kafka/util/VersionUtil.java   |  32 +++
 .../apache/plc4x/kafka/Plc4XSinkConfigTest.java    |  31 +++
 .../apache/plc4x/kafka/Plc4XSourceConfigTest.java  |  31 +++
 .../apache/plc4x/kafka/Plc4xSinkConnectorTest.java |  30 +++
 .../org/apache/plc4x/kafka/Plc4xSinkTaskTest.java  |  30 +++
 .../plc4x/kafka/Plc4xSourceConnectorTest.java      |  30 +++
 .../apache/plc4x/kafka/Plc4xSourceTaskTest.java    |  30 +++
 .../src/test/resources/logback.xml}                |  35 +--
 integrations/pom.xml                               |   1 +
 plc4j/protocols/pom.xml                            |   1 +
 {integrations => plc4j/protocols/test}/pom.xml     |  25 +-
 .../org/apache/plc4x/java/test/TestConnection.java | 149 +++++++++++
 .../org/apache/plc4x/java/test/TestDevice.java     |  76 ++++++
 .../java/org/apache/plc4x/java/test/TestField.java |  72 +++++
 .../apache/plc4x/java/test/TestFieldHandler.java   |   4 +
 .../org/apache/plc4x/java/test/TestFieldItem.java  |   4 +
 .../org/apache/plc4x/java/test/TestPlcDriver.java  |  61 +++++
 .../java/org/apache/plc4x/java/test/TestType.java  |   4 +
 .../services/org.apache.plc4x.java.api.PlcDriver   |  19 ++
 .../org/apache/plc4x/java/test/TestDeviceTest.java |  53 ++++
 41 files changed, 2333 insertions(+), 63 deletions(-)

diff --cc examples/pom.xml
index e0185ca,426dc6f..538b124
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@@ -36,9 -36,7 +36,10 @@@
    <description>Parent of all application example modules.</description>
  
    <modules>
 +    <module>azure</module>
      <module>dummy-driver</module>
++    <module>google</module>
 +    <module>hello-plc4x</module>
      <module>iot-factory</module>
      <module>iotree</module>
      <module>kafka-bridge</module>
diff --cc plc4j/protocols/pom.xml
index 7e53016,2565f43..9c97e7e
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@@ -37,10 -37,11 +37,11 @@@
    <modules>
      <module>driver-bases</module>
  
 -    <module>ads</module>
 +    <!--module>ads</module>
      <module>ethernetip</module>
 -    <module>modbus</module>
 +    <module>modbus</module-->
      <module>s7</module>
+     <module>test</module>
  
      <module>benchmarks</module>
    </modules>
diff --cc plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
index 0000000,549b7f4..549b7f4
mode 000000,100644..100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
diff --cc plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java
index 0000000,0000000..c640346
new file mode 100644
--- /dev/null
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java
@@@ -1,0 -1,0 +1,4 @@@
++package org.apache.plc4x.java.test;
++
++public class TestFieldHandler {
++}
diff --cc plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldItem.java
index 0000000,0000000..2d30ab3
new file mode 100644
--- /dev/null
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldItem.java
@@@ -1,0 -1,0 +1,4 @@@
++package org.apache.plc4x.java.test;
++
++public class TestFieldItem {
++}
diff --cc plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestType.java
index 0000000,0000000..67d5728
new file mode 100644
--- /dev/null
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestType.java
@@@ -1,0 -1,0 +1,4 @@@
++package org.apache.plc4x.java.test;
++
++public enum TestType {
++}