You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/12 08:52:17 UTC
[incubator-streampipes-extensions] branch dev updated (7508138 ->
e29de52)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git.
from 7508138 [hotfix] Change failing tests
add 36f2cc3 Splitting streampipes-connect-adapters
add 3ca26f6 Merge branch 'dev' into dev
add 1519b01 Refactor streampipes-connect-adapters
new 27a3773 [STREAMPIPES-387] Split StreamPipes Connect worker into two different services
new e29de52 [STREAMPIPES-387] Split StreamPipes Connect worker into two different services
The 2 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:
.github/workflows/build.yml | 30 ++-
.idea/runConfigurations/connect_adapters.xml | 1 +
.idea/runConfigurations/connect_adapters_iiot.xml | 15 ++
pom.xml | 1 +
.../.idea/workspace.xml | 65 ++++++
.../Dockerfile | 4 +-
.../aarch64.Dockerfile | 4 +-
.../arm.Dockerfile | 4 +-
.../development/env | 1 +
streampipes-connect-adapters-iiot/pom.xml | 247 +++++++++++++++++++++
.../connect/iiot/ConnectAdapterIiotInit.java | 72 ++++++
.../connect/iiot}/adapters/PullAdapter.java | 8 +-
.../connect/iiot}/adapters/PullRestAdapter.java | 2 +-
.../iiot}/adapters/influxdb/InfluxDbClient.java | 2 +-
.../adapters/influxdb/InfluxDbSetAdapter.java | 4 +-
.../adapters/influxdb/InfluxDbStreamAdapter.java | 10 +-
.../connect/iiot}/adapters/mysql/Column.java | 2 +-
.../connect/iiot}/adapters/mysql/MySqlAdapter.java | 2 +-
.../connect/iiot}/adapters/mysql/MySqlClient.java | 2 +-
.../iiot}/adapters/mysql/MySqlSetAdapter.java | 4 +-
.../iiot}/adapters/mysql/MySqlStreamAdapter.java | 4 +-
.../iiot}/adapters/netio/NetioMQTTAdapter.java | 14 +-
.../iiot}/adapters/netio/NetioRestAdapter.java | 10 +-
.../connect/iiot}/adapters/netio/NetioUtils.java | 6 +-
.../adapters/netio/model/NetioAllPowerOutputs.java | 2 +-
.../adapters/netio/model/NetioGlobalMeasure.java | 2 +-
.../adapters/netio/model/NetioPowerOutput.java | 2 +-
.../connect/iiot}/adapters/opcua/OpcNode.java | 2 +-
.../connect/iiot}/adapters/opcua/OpcUa.java | 12 +-
.../connect/iiot}/adapters/opcua/OpcUaAdapter.java | 10 +-
.../adapters/opcua/utils/OpcUaNodeVariants.java | 2 +-
.../iiot}/adapters/opcua/utils/OpcUaTypes.java | 2 +-
.../iiot}/adapters/opcua/utils/OpcUaUtil.java | 6 +-
.../adapters/plc4x/modbus/ModbusConfigFile.java | 2 +-
.../adapters/plc4x/modbus/Plc4xModbusAdapter.java | 6 +-
.../plc4x/passive/Plc4xPassiveAdapter.java | 4 +-
.../iiot}/adapters/plc4x/s7/Plc4xS7Adapter.java | 6 +-
.../iiot}/adapters/ros/RosBridgeAdapter.java | 4 +-
.../simulator/machine/MachineDataSimulator.java | 2 +-
.../machine/MachineDataSimulatorUtils.java | 2 +-
.../machine/MachineDataStreamAdapter.java | 4 +-
.../connect/iiot}/protocol/set/FileProtocol.java | 4 +-
.../connect/iiot}/protocol/set/HttpProtocol.java | 4 +-
.../iiot}/protocol/stream/BrokerProtocol.java | 2 +-
.../iiot}/protocol/stream/FileStreamProtocol.java | 4 +-
.../protocol/stream/HttpServerEventReceiver.java | 2 +-
.../iiot}/protocol/stream/HttpServerProtocol.java | 4 +-
.../iiot}/protocol/stream/HttpStreamProtocol.java | 18 +-
.../connect/iiot}/protocol/stream/KafkaConfig.java | 2 +-
.../iiot}/protocol/stream/KafkaProtocol.java | 6 +-
.../connect/iiot}/protocol/stream/MqttConfig.java | 2 +-
.../iiot}/protocol/stream/MqttConsumer.java | 2 +-
.../iiot}/protocol/stream/MqttProtocol.java | 6 +-
.../iiot}/protocol/stream/PullProtocol.java | 2 +-
.../protocol/stream/pulsar/PulsarConsumer.java | 2 +-
.../protocol/stream/pulsar/PulsarProtocol.java | 6 +-
.../iiot}/protocol/stream/pulsar/PulsarUtils.java | 2 +-
.../connect/iiot}/utils/KafkaConnectUtils.java | 4 +-
.../connect/iiot}/utils/MqttConnectUtils.java | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 11 +
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 8 +
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 10 +
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 7 +
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 10 +
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 6 +-
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 4 +-
streampipes-connect-adapters/Dockerfile | 2 +-
streampipes-connect-adapters/aarch64.Dockerfile | 2 +-
streampipes-connect-adapters/arm.Dockerfile | 4 +-
streampipes-connect-adapters/development/env | 1 +
streampipes-connect-adapters/pom.xml | 46 ----
.../streampipes/connect/ConnectAdapterInit.java | 57 ++---
.../trafficcamera/CameraDataHttpExecutor.java | 39 ----
.../trafficcamera/CameraFeatureTransformer.java | 66 ------
.../trafficcamera/CameraInfoHttpExecutor.java | 47 ----
.../trafficcamera/NswTrafficCameraAdapter.java | 151 -------------
.../trafficcamera/TrafficCameraSensorNames.java | 42 ----
.../nswaustralia/trafficcamera/model/Feature.java | 69 ------
.../trafficcamera/model/FeatureCollection.java | 62 ------
.../nswaustralia/trafficcamera/model/Geometry.java | 52 -----
.../trafficcamera/model/Properties.java | 80 -------
.../nswaustralia/trafficcamera/model/Rights.java | 50 -----
.../connect/protocol/stream/MqttConsumer.java | 2 +-
.../connect/protocol/stream/WebsocketClient.java | 92 --------
.../connect/protocol/stream/WebsocketProtocol.java | 101 ---------
.../documentation.md | 33 ---
.../icon.png | Bin 3016 -> 0 bytes
.../strings.en | 6 -
.../strings.en | 11 -
.../strings.en | 8 -
.../strings.en | 10 -
.../strings.en | 10 -
.../strings.en | 7 -
143 files changed, 636 insertions(+), 1178 deletions(-)
create mode 100644 .idea/runConfigurations/connect_adapters_iiot.xml
create mode 100644 streampipes-connect-adapters-iiot/.idea/workspace.xml
copy {streampipes-sinks-brokers-jvm => streampipes-connect-adapters-iiot}/Dockerfile (83%)
copy {streampipes-extensions-all-jvm => streampipes-connect-adapters-iiot}/aarch64.Dockerfile (85%)
copy {streampipes-extensions-all-jvm => streampipes-connect-adapters-iiot}/arm.Dockerfile (85%)
copy {streampipes-connect-adapters => streampipes-connect-adapters-iiot}/development/env (98%)
create mode 100644 streampipes-connect-adapters-iiot/pom.xml
create mode 100644 streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/PullAdapter.java (98%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/PullRestAdapter.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/influxdb/InfluxDbClient.java (99%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/influxdb/InfluxDbSetAdapter.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/influxdb/InfluxDbStreamAdapter.java (96%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/mysql/Column.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/mysql/MySqlAdapter.java (99%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/mysql/MySqlClient.java (99%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/mysql/MySqlSetAdapter.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/mysql/MySqlStreamAdapter.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/NetioMQTTAdapter.java (92%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/NetioRestAdapter.java (95%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/NetioUtils.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/model/NetioAllPowerOutputs.java (95%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/model/NetioGlobalMeasure.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/netio/model/NetioPowerOutput.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/OpcNode.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/OpcUa.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/OpcUaAdapter.java (96%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/utils/OpcUaNodeVariants.java (95%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/utils/OpcUaTypes.java (96%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/opcua/utils/OpcUaUtil.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/plc4x/modbus/ModbusConfigFile.java (95%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/plc4x/modbus/Plc4xModbusAdapter.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/plc4x/passive/Plc4xPassiveAdapter.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/plc4x/s7/Plc4xS7Adapter.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/ros/RosBridgeAdapter.java (99%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/simulator/machine/MachineDataSimulator.java (98%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/simulator/machine/MachineDataSimulatorUtils.java (98%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/adapters/simulator/machine/MachineDataStreamAdapter.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/set/FileProtocol.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/set/HttpProtocol.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/BrokerProtocol.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/FileStreamProtocol.java (99%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/HttpServerEventReceiver.java (95%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/HttpServerProtocol.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/HttpStreamProtocol.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/KafkaConfig.java (96%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/KafkaProtocol.java (98%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/MqttConfig.java (96%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/MqttConsumer.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/MqttProtocol.java (96%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/PullProtocol.java (98%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/pulsar/PulsarConsumer.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/pulsar/PulsarProtocol.java (97%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/protocol/stream/pulsar/PulsarUtils.java (94%)
rename {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/utils/KafkaConnectUtils.java (97%)
copy {streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect => streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot}/utils/MqttConnectUtils.java (96%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.set}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.set}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.set}/strings.en (78%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.stream}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.stream}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.influxdb.stream}/strings.en (81%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.set}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.set}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.set}/strings.en (70%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.stream}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.stream}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.mysql.stream}/strings.en (69%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.mqtt}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.mqtt}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.mqtt}/strings.en (75%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.rest}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.rest}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.netio.rest}/strings.en (69%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.opcua}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.opcua}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.opcua}/strings.en (88%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7 => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.modbus}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7 => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.modbus}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.modbus}/strings.en (87%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.s7}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.s7}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7 => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.plc4x.s7}/strings.en (76%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros}/icon.png (100%)
create mode 100644 streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.simulator.machine}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.simulator.machine}/icon.png (100%)
create mode 100644 streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.simulator.machine/strings.en
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.file}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.file}/icon.png (100%)
create mode 100644 streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.file/strings.en
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.http}/documentation.md (100%)
copy {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.http}/icon.png (100%)
create mode 100644 streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.set.http/strings.en
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.file}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.file}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.file}/strings.en (59%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.http}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.http}/icon.png (100%)
create mode 100644 streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.http/strings.en
copy {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.httpserver => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.httpserver}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.httpserver}/icon.png (100%)
copy {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.httpserver => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.httpserver}/strings.en (75%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.kafka}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.kafka}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.kafka}/strings.en (71%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.mqtt}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.mqtt}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.mqtt}/strings.en (70%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.pulsar}/documentation.md (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.pulsar}/icon.png (100%)
rename {streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar => streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.protocol.stream.pulsar}/strings.en (57%)
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraDataHttpExecutor.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraFeatureTransformer.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraInfoHttpExecutor.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/TrafficCameraSensorNames.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Feature.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/FeatureCollection.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Geometry.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Properties.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Rights.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketClient.java
delete mode 100644 streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/documentation.md
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/icon.png
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/strings.en
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/strings.en
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/strings.en
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/strings.en
delete mode 100644 streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/strings.en
[incubator-streampipes-extensions] 02/02: [STREAMPIPES-387] Split
StreamPipes Connect worker into two different services
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit e29de52753a39dca98d4f608631e36f4acccccca
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Oct 12 10:51:57 2021 +0200
[STREAMPIPES-387] Split StreamPipes Connect worker into two different services
---
.idea/runConfigurations/connect_adapters.xml | 1 +
.idea/runConfigurations/connect_adapters_iiot.xml | 1 +
streampipes-connect-adapters-iiot/Dockerfile | 2 +-
.../aarch64.Dockerfile | 2 +-
streampipes-connect-adapters-iiot/arm.Dockerfile | 4 +-
streampipes-connect-adapters-iiot/development/env | 1 +
streampipes-connect-adapters-iiot/pom.xml | 42 ----
.../connect/iiot/ConnectAdapterIiotInit.java | 7 +-
streampipes-connect-adapters/Dockerfile | 2 +-
streampipes-connect-adapters/aarch64.Dockerfile | 2 +-
streampipes-connect-adapters/arm.Dockerfile | 4 +-
streampipes-connect-adapters/development/env | 1 +
streampipes-connect-adapters/pom.xml | 46 ----
.../streampipes/connect/ConnectAdapterInit.java | 6 +-
.../streampipes/connect/adapters/mysql/Column.java | 90 -------
.../connect/adapters/mysql/MySqlAdapter.java | 269 ---------------------
.../connect/adapters/mysql/MySqlClient.java | 215 ----------------
.../connect/adapters/mysql/MySqlSetAdapter.java | 203 ----------------
.../connect/adapters/mysql/MySqlStreamAdapter.java | 201 ---------------
.../connect/protocol/stream/BrokerProtocol.java | 69 ------
.../connect/protocol/stream/MqttProtocol.java | 137 -----------
.../connect/protocol/stream/PullProtocol.java | 98 --------
.../protocol/stream/pulsar/PulsarConsumer.java | 88 -------
.../protocol/stream/pulsar/PulsarProtocol.java | 149 ------------
.../protocol/stream/pulsar/PulsarUtils.java | 33 ---
.../documentation.md | 35 ---
.../icon.png | Bin 9982 -> 0 bytes
.../strings.en | 23 --
.../documentation.md | 35 ---
.../icon.png | Bin 9982 -> 0 bytes
.../strings.en | 26 --
.../documentation.md | 33 ---
.../icon.png | Bin 99909 -> 0 bytes
.../strings.en | 23 --
.../documentation.md | 33 ---
.../icon.png | Bin 99909 -> 0 bytes
.../strings.en | 24 --
.../documentation.md | 58 -----
.../icon.png | Bin 35364 -> 0 bytes
.../strings.en | 27 ---
.../documentation.md | 58 -----
.../icon.png | Bin 35364 -> 0 bytes
.../strings.en | 14 --
.../documentation.md | 33 ---
.../icon.png | Bin 3016 -> 0 bytes
.../strings.en | 6 -
.../documentation.md | 70 ------
.../icon.png | Bin 5087 -> 0 bytes
.../strings.en | 58 -----
.../documentation.md | 33 ---
.../icon.png | Bin 46022 -> 0 bytes
.../strings.en | 45 ----
.../documentation.md | 33 ---
.../icon.png | Bin 46022 -> 0 bytes
.../strings.en | 26 --
.../documentation.md | 58 -----
.../icon.png | Bin 4838 -> 0 bytes
.../strings.en | 11 -
.../documentation.md | 34 ---
.../icon.png | Bin 31009 -> 0 bytes
.../strings.en | 8 -
.../documentation.md | 32 ---
.../icon.png | Bin 12881 -> 0 bytes
.../strings.en | 12 -
.../documentation.md | 32 ---
.../icon.png | Bin 17467 -> 0 bytes
.../strings.en | 10 -
.../documentation.md | 32 ---
.../icon.png | Bin 9110 -> 0 bytes
.../strings.en | 29 ---
.../documentation.md | 47 ----
.../icon.png | Bin 22561 -> 0 bytes
.../strings.en | 27 ---
.../documentation.md | 32 ---
.../icon.png | Bin 22890 -> 0 bytes
.../strings.en | 13 -
.../documentation.md | 32 ---
.../icon.png | Bin 12881 -> 0 bytes
.../strings.en | 10 -
.../documentation.md | 32 ---
.../icon.png | Bin 17467 -> 0 bytes
.../strings.en | 7 -
82 files changed, 20 insertions(+), 2804 deletions(-)
diff --git a/.idea/runConfigurations/connect_adapters.xml b/.idea/runConfigurations/connect_adapters.xml
index 5988ea6..7f920dd 100644
--- a/.idea/runConfigurations/connect_adapters.xml
+++ b/.idea/runConfigurations/connect_adapters.xml
@@ -1,6 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="connect-adapters" type="Application" factoryName="Application">
<envs>
+ <env name="SP_PORT" value="8001" />
<env name="SP_DATA_LOCATION" value="./test_data/" />
<env name="SP_DEBUG" value="true" />
<env name="SP_DEBUG_CONNECT" value="false" />
diff --git a/.idea/runConfigurations/connect_adapters_iiot.xml b/.idea/runConfigurations/connect_adapters_iiot.xml
index 0c499f1..ace1686 100644
--- a/.idea/runConfigurations/connect_adapters_iiot.xml
+++ b/.idea/runConfigurations/connect_adapters_iiot.xml
@@ -1,6 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="connect-adapters-iiot" type="Application" factoryName="Application">
<envs>
+ <env name="SP_PORT" value="8002" />
<env name="SP_DATA_LOCATION" value="./test_data/" />
<env name="SP_DEBUG" value="true" />
<env name="SP_DEBUG_CONNECT" value="false" />
diff --git a/streampipes-connect-adapters-iiot/Dockerfile b/streampipes-connect-adapters-iiot/Dockerfile
index 98f060b..ca14330 100644
--- a/streampipes-connect-adapters-iiot/Dockerfile
+++ b/streampipes-connect-adapters-iiot/Dockerfile
@@ -18,7 +18,7 @@ FROM $BASE_IMAGE
ENV CONSUL_LOCATION consul
-EXPOSE 8099
+EXPOSE 8090
COPY target/streampipes-connect-adapters-iiot.jar /streampipes-connect-adapters-iiot.jar
diff --git a/streampipes-connect-adapters-iiot/aarch64.Dockerfile b/streampipes-connect-adapters-iiot/aarch64.Dockerfile
index bb7a62f..d5b2d5f 100644
--- a/streampipes-connect-adapters-iiot/aarch64.Dockerfile
+++ b/streampipes-connect-adapters-iiot/aarch64.Dockerfile
@@ -18,7 +18,7 @@ FROM $BASE_IMAGE
ENV CONSUL_LOCATION consul
-EXPOSE 8099
+EXPOSE 8090
COPY qemu-aarch64-static /usr/bin
COPY target/streampipes-connect-adapters-iiot.jar /streampipes-connect-adapters-iiot.jar
diff --git a/streampipes-connect-adapters-iiot/arm.Dockerfile b/streampipes-connect-adapters-iiot/arm.Dockerfile
index 1287796..edc7f21 100644
--- a/streampipes-connect-adapters-iiot/arm.Dockerfile
+++ b/streampipes-connect-adapters-iiot/arm.Dockerfile
@@ -21,6 +21,6 @@ ENV CONSUL_LOCATION consul
EXPOSE 8090
COPY qemu-arm-static /usr/bin
-COPY target/streampipes-connect-adapters-iiot.jar /streampipes-processing-element-containers.jar
+COPY target/streampipes-connect-adapters-iiot.jar /streampipes-connect-adapters-iiot.jar
-ENTRYPOINT ["java", "-jar", "/streampipes-processing-element-containers.jar"]
+ENTRYPOINT ["java", "-jar", "/streampipes-connect-adapters-iiot.jar"]
diff --git a/streampipes-connect-adapters-iiot/development/env b/streampipes-connect-adapters-iiot/development/env
index 75421b0..2f7b5b4 100644
--- a/streampipes-connect-adapters-iiot/development/env
+++ b/streampipes-connect-adapters-iiot/development/env
@@ -15,6 +15,7 @@
# Those parameters are used by IntelliJ to set the default consul parameters for development
+SP_PORT=8002
SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
SP_CONNECT_CONTAINER_HOST=host.docker.internal
SP_CONNECT_CONTAINER_MASTER_HOST=localhost
diff --git a/streampipes-connect-adapters-iiot/pom.xml b/streampipes-connect-adapters-iiot/pom.xml
index ee9962b..73e173d 100644
--- a/streampipes-connect-adapters-iiot/pom.xml
+++ b/streampipes-connect-adapters-iiot/pom.xml
@@ -68,10 +68,6 @@
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
- <groupId>com.ullink.slack</groupId>
- <artifactId>simpleslackapi</artifactId>
- </dependency>
- <dependency>
<groupId>edu.wpi.rail</groupId>
<artifactId>jrosbridge</artifactId>
</dependency>
@@ -116,44 +112,6 @@
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jetty-server</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlet</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlets</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-webapp</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-util</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
</dependency>
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
index 074a895..5c91e99 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
@@ -44,9 +44,10 @@ public class ConnectAdapterIiotInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
- return SpServiceDefinitionBuilder.create("connect-worker-main",
- "StreamPipes Connect Worker Main",
- "",8001)
+ return SpServiceDefinitionBuilder.create("connect-adapter-iiot",
+ "StreamPipes connect worker containing adapters relevant for the IIoT",
+ "",
+ 8090)
.registerAdapter(new MySqlStreamAdapter())
.registerAdapter(new MySqlSetAdapter())
.registerAdapter(new MachineDataStreamAdapter())
diff --git a/streampipes-connect-adapters/Dockerfile b/streampipes-connect-adapters/Dockerfile
index aadab4d..9a4647e 100644
--- a/streampipes-connect-adapters/Dockerfile
+++ b/streampipes-connect-adapters/Dockerfile
@@ -18,7 +18,7 @@ FROM $BASE_IMAGE
ENV CONSUL_LOCATION consul
-EXPOSE 8099
+EXPOSE 8090
COPY target/streampipes-connect-adapters.jar /streampipes-connect-adapters.jar
diff --git a/streampipes-connect-adapters/aarch64.Dockerfile b/streampipes-connect-adapters/aarch64.Dockerfile
index a97e46b..68f5eeb 100644
--- a/streampipes-connect-adapters/aarch64.Dockerfile
+++ b/streampipes-connect-adapters/aarch64.Dockerfile
@@ -18,7 +18,7 @@ FROM $BASE_IMAGE
ENV CONSUL_LOCATION consul
-EXPOSE 8099
+EXPOSE 8090
COPY qemu-aarch64-static /usr/bin
COPY target/streampipes-connect-adapters.jar /streampipes-connect-adapters.jar
diff --git a/streampipes-connect-adapters/arm.Dockerfile b/streampipes-connect-adapters/arm.Dockerfile
index 14b521b..3ef0ac1 100644
--- a/streampipes-connect-adapters/arm.Dockerfile
+++ b/streampipes-connect-adapters/arm.Dockerfile
@@ -21,6 +21,6 @@ ENV CONSUL_LOCATION consul
EXPOSE 8090
COPY qemu-arm-static /usr/bin
-COPY target/streampipes-connect-adapters.jar /streampipes-processing-element-containers.jar
+COPY target/streampipes-connect-adapters.jar /streampipes-connect-adapters.jar
-ENTRYPOINT ["java", "-jar", "/streampipes-processing-element-containers.jar"]
+ENTRYPOINT ["java", "-jar", "/streampipes-connect-adapters.jar"]
diff --git a/streampipes-connect-adapters/development/env b/streampipes-connect-adapters/development/env
index 75421b0..75b9850 100644
--- a/streampipes-connect-adapters/development/env
+++ b/streampipes-connect-adapters/development/env
@@ -15,6 +15,7 @@
# Those parameters are used by IntelliJ to set the default consul parameters for development
+SP_PORT=8001
SP_CONNECT_CONTAINER_WORKER_HOST=host.docker.internal
SP_CONNECT_CONTAINER_HOST=host.docker.internal
SP_CONNECT_CONTAINER_MASTER_HOST=localhost
diff --git a/streampipes-connect-adapters/pom.xml b/streampipes-connect-adapters/pom.xml
index 054e1fa..781bb5d 100644
--- a/streampipes-connect-adapters/pom.xml
+++ b/streampipes-connect-adapters/pom.xml
@@ -43,18 +43,6 @@
<!-- External dependencies -->
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.shyiko</groupId>
- <artifactId>mysql-binlog-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>org.influxdb</groupId>
- <artifactId>influxdb-java</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</dependency>
@@ -75,10 +63,6 @@
<artifactId>simpleslackapi</artifactId>
</dependency>
<dependency>
- <groupId>edu.wpi.rail</groupId>
- <artifactId>jrosbridge</artifactId>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
@@ -103,10 +87,6 @@
<artifactId>javax.websocket-api</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
</dependency>
@@ -157,28 +137,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-connection-pool</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-s7</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-modbus</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
</dependency>
@@ -191,10 +149,6 @@
<artifactId>animal-sniffer-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-sse</artifactId>
<exclusions>
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index aa18243..5091f00 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -29,6 +29,7 @@ import org.apache.streampipes.connect.adapters.iss.IssAdapter;
import org.apache.streampipes.connect.adapters.simulator.random.RandomDataSetAdapter;
import org.apache.streampipes.connect.adapters.simulator.random.RandomDataStreamAdapter;
import org.apache.streampipes.connect.adapters.slack.SlackAdapter;
+import org.apache.streampipes.connect.adapters.ti.TISensorTag;
import org.apache.streampipes.connect.adapters.wikipedia.WikipediaEditedArticlesAdapter;
import org.apache.streampipes.connect.adapters.wikipedia.WikipediaNewArticlesAdapter;
import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
@@ -43,9 +44,9 @@ public class ConnectAdapterInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
- return SpServiceDefinitionBuilder.create("connect-worker-main",
+ return SpServiceDefinitionBuilder.create("connect-adapter",
"StreamPipes Connect Worker Main",
- "",8002)
+ "",8090)
.registerAdapter(new GdeltAdapter())
.registerAdapter(new CoindeskBitcoinAdapter())
.registerAdapter(new IexCloudNewsAdapter())
@@ -59,6 +60,7 @@ public class ConnectAdapterInit extends ExtensionsModelSubmitter {
.registerAdapter(new ImageSetAdapter())
.registerAdapter(new IssAdapter())
.registerAdapter(new FlicMQTTAdapter())
+ .registerAdapter(new TISensorTag())
// .registerAdapter(new HDFSProtocol())
.build();
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
deleted file mode 100644
index 986ca8d..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
+++ /dev/null
@@ -1,90 +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.streampipes.connect.adapters.mysql;
-
-import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.vocabulary.SO;
-
-class Column {
- private String name;
- private Datatypes type;
- private Object def;
- private String domainProperty;
-
- Column(String name, String dataType, String columnType) {
- this.name = name;
- switch (dataType) {
- case "tinyint":
- case "smallint":
- case "mediumint":
- case "int":
- case "bit":
- this.type = Datatypes.Integer;
- def = 0;
- break;
- case "bigint":
- this.type = Datatypes.Long;
- def = 0L;
- break;
- case "float":
- case "decimal": // Watch out for loss of precision
- case "double":
- this.type = Datatypes.Float;
- def = 0.0f;
- break;
- case "text":
- case "varchar":
- case "char":
- this.type = Datatypes.String;
- def = "";
- break;
- case "date":
- case "datetime":
- case "time":
- case "timestamp":
- case "year":
- this.type = Datatypes.Float;
- def = System.currentTimeMillis();
- this.domainProperty = SO.DateTime;
- break;
- default:
- throw new IllegalArgumentException("Type " + type + " not supported.");
- }
- if (columnType.equals("tinyint(1)") || columnType.equals("bit(1)")) {
- this.type = Datatypes.Boolean;
- def = Boolean.FALSE;
- }
- System.out.println("Found column: " + name + ", type: " + this.type + " (sql-type: "
- + dataType + ", column-tpye: " + columnType + ")");
- }
-
- public String getName() {
- return name;
- }
- public Datatypes getType() {
- return type;
- }
- public Object getDefault() {
- return def;
- }
-
- public String getDomainProperty() {
- return domainProperty;
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java
deleted file mode 100644
index 33b3099..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java
+++ /dev/null
@@ -1,269 +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.streampipes.connect.adapters.mysql;
-
-import com.github.shyiko.mysql.binlog.BinaryLogClient;
-import com.github.shyiko.mysql.binlog.event.*;
-import com.github.shyiko.mysql.binlog.event.deserialization.EventDeserializer;
-import org.apache.streampipes.connect.adapter.Adapter;
-import org.apache.streampipes.connect.api.exception.AdapterException;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
-import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.vocabulary.SO;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class MySqlAdapter extends SpecificDataStreamAdapter {
-
- public static final String ID = "http://streampipes.org/adapter/specific/mysql";
-
- private static String MYSQL_HOST = "MYSQL_HOST";
- private static String MYSQL_USER = "MYSQL_USER";
- private static String MYSQL_PASS = "MYSQL_PASS";
- private static String MYSQL_DB = "MYSQL_DB";
- private static String MYSQL_TABLE = "MYSQL_TABLE";
- private static String MYSQL_PORT = "MYSQL_PORT";
-
- private String host;
- private String user;
- private String pass;
- private String database;
- private String table;
- private String port;
-
- private boolean dataComing = false;
- private List<Column> tableSchema;
- private BinaryLogClient client;
-
- public MySqlAdapter() {
- }
-
- public MySqlAdapter(SpecificAdapterStreamDescription adapterDescription) {
- super(adapterDescription);
-
- getConfigurations(adapterDescription);
- }
-
- @Override
- public SpecificAdapterStreamDescription declareModel() {
- //TODO: Add Icon
- SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(ID,
- "MySql Adapter",
- "Creates a data stream for a SQL table")
- .iconUrl("sql.png")
- .requiredTextParameter(Labels.from(MYSQL_HOST, "Hostname", "Hostname of the MySql Server"))
- .requiredTextParameter(Labels.from(MYSQL_USER, "Username", "Username of the user"))
- .requiredTextParameter(Labels.from(MYSQL_PASS, "Password", "Password of the user"))
- .requiredTextParameter(Labels.from(MYSQL_DB, "Database", "Database in which the table is located"))
- .requiredTextParameter(Labels.from(MYSQL_TABLE, "Table", "Table which should be watched"))
- .requiredIntegerParameter(Labels.from(MYSQL_PORT, "Port", "Port of the MySql Server. Default: 3306"), 3306)
- .build();
-
- description.setAppId(ID);
- return description;
- }
-
- @Override
- public void startAdapter() throws AdapterException {
- checkJdbcDriver();
- extractTableInformation();
-
- // Connect BinaryLogClient
- client = new BinaryLogClient(host, Integer.parseInt(port), user, pass);
- EventDeserializer eventDeserializer = new EventDeserializer();
- eventDeserializer.setCompatibilityMode(
- EventDeserializer.CompatibilityMode.DATE_AND_TIME_AS_LONG,
- EventDeserializer.CompatibilityMode.CHAR_AND_BINARY_AS_BYTE_ARRAY
- );
- client.setEventDeserializer(eventDeserializer);
- client.registerEventListener(event -> sendEvent(event));
- try {
- client.connect();
- } catch (IOException e) {
- throw new AdapterException(e.getMessage());
- }
- }
-
- private void sendEvent(Event event) {
- // An event can contain multiple insertions/updates
- if (event.getHeader().getEventType() == EventType.TABLE_MAP) {
- // Check table and database, if the next event should be streamed
- if (((TableMapEventData) event.getData()).getDatabase().equals(database)
- && ((TableMapEventData) event.getData()).getTable().equals((table))) {
- dataComing = true;
- }
- }
- if (dataComing) {
- if (EventType.isUpdate(event.getHeader().getEventType())) {
- for (Entry<Serializable[], Serializable[]> en : ((UpdateRowsEventData) event.getData()).getRows()) {
- sendChange(en.getValue());
- }
- dataComing = false;
- } else if (EventType.isWrite(event.getHeader().getEventType())) {
- for (Serializable[] s : ((WriteRowsEventData) event.getData()).getRows()) {
- sendChange(s);
- }
- dataComing = false;
- }
- }
- }
-
- private void sendChange(Serializable[] rows) {
- Map<String, Object> out = new HashMap<>();
- for (int i = 0; i < rows.length; i++) {
- if (rows[i] != null) {
- if (rows[i] instanceof byte[]) {
- // Strings are sent in byte arrays and have to be converted. TODO: Check that encoding is correct
- out.put(tableSchema.get(i).getName(), new String((byte[])rows[i]));
- } else {
- out.put(tableSchema.get(i).getName(), rows[i]);
- }
- } else {
- out.put(tableSchema.get(i).getName(), tableSchema.get(i).getDefault());
- }
- }
- adapterPipeline.process(out);
- }
-
- @Override
- public void stopAdapter() throws AdapterException {
- try {
- client.disconnect();
- } catch (IOException e) {
- throw new AdapterException("Thrown exception: " + e.getMessage());
- }
- }
-
- @Override
- public Adapter getInstance(SpecificAdapterStreamDescription adapterDescription) {
- return new MySqlAdapter(adapterDescription);
- }
-
- @Override
- public GuessSchema getSchema(SpecificAdapterStreamDescription adapterDescription)
- throws AdapterException, ParseException {
- // Load JDBC Driver, connect JDBC Driver, Extract information, disconnect JDBC Driver
- EventSchema eventSchema = new EventSchema();
- GuessSchema guessSchema = new GuessSchema();
- List<EventProperty> allProperties = new ArrayList<>();
-
- getConfigurations(adapterDescription);
-
- checkJdbcDriver();
- extractTableInformation();
-
- for (Column column : tableSchema) {
- if (SO.DateTime.equals(column.getDomainProperty())) {
- allProperties.add(PrimitivePropertyBuilder
- .create(column.getType(), column.getName())
- .label(column.getName())
- .domainProperty(SO.DateTime)
- .build());
- } else {
- allProperties.add(PrimitivePropertyBuilder
- .create(column.getType(), column.getName())
- .label(column.getName())
- .build());
- }
-
- }
-
- eventSchema.setEventProperties(allProperties);
- guessSchema.setEventSchema(eventSchema);
-
- return guessSchema;
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- private void getConfigurations(SpecificAdapterStreamDescription adapterDescription) {
- ParameterExtractor extractor = new ParameterExtractor(adapterDescription.getConfig());
-
- this.host = extractor.singleValue(MYSQL_HOST, String.class);
- this.user = extractor.singleValue(MYSQL_USER, String.class);
- this.pass = extractor.singleValue(MYSQL_PASS, String.class);
- this.database = extractor.singleValue(MYSQL_DB, String.class);
- this.table = extractor.singleValue(MYSQL_TABLE, String.class);
- this.port = extractor.singleValue(MYSQL_PORT, String.class);
- }
-
- private void checkJdbcDriver() throws AdapterException {
- try {
- Class.forName("com.mysql.cj.jdbc.Driver");
- } catch (ClassNotFoundException e) {
- throw new AdapterException("MySql Driver not found.");
- }
- }
-
- private void extractTableInformation() throws AdapterException {
- String server = "jdbc:mysql://" + host + ":" + port + "/" + "?sslMode=DISABLED&allowPublicKeyRetrieval=true";
- ResultSet resultSet = null;
- tableSchema = new ArrayList<>();
-
- String query = "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_TYPE FROM "
- + "INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND TABLE_SCHEMA = ? ORDER BY "
- + "ORDINAL_POSITION ASC;";
-
- try (Connection con = DriverManager.getConnection(server, user, pass);
- PreparedStatement statement = con.prepareStatement(query)) {
-
- statement.setString(1, table);
- statement.setString(2, database);
- resultSet = statement.executeQuery();
-
- if (resultSet.next()) {
- do {
- String name = resultSet.getString("COLUMN_NAME");
- String dataType = resultSet.getString("DATA_TYPE");
- String columnType = resultSet.getString("COLUMN_TYPE");
- tableSchema.add(new Column(name, dataType, columnType));
- } while(resultSet.next());
- } else {
- // No columns found -> Table/Database does not exist
- throw new IllegalArgumentException("Database/table not found");
- }
- } catch (SQLException e) {
- throw new AdapterException("SqlException: " + e.getMessage()
- + ", Error code: " + e.getErrorCode()
- + ", SqlState: " + e.getSQLState());
- } finally {
- try {
- resultSet.close();
- } catch (Exception e) {}
- }
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java
deleted file mode 100644
index c882c3d..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java
+++ /dev/null
@@ -1,215 +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.streampipes.connect.adapters.mysql;
-
-import org.apache.streampipes.connect.api.exception.AdapterException;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.apache.streampipes.vocabulary.SO;
-
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MySqlClient {
-
- public static final String ID = "http://streampipes.org/adapter/specific/mysql";
-
- static final String HOST = "mysqlHost";
- static final String PORT = "mysqlPort";
- static final String DATABASE = "mysqlDatabase";
- static final String TABLE = "mysqlTable";
- static final String USER = "mysqlUser";
- static final String PASSWORD = "mysqlPassword";
-
- static final String REPLACE_NULL_VALUES = "replaceNullValues";
- static final String DO_REPLACE_NULL_VALUES = "doReplaceNullValues";
- static final String DO_NOT_REPLACE_NULL_VALUES = "doNotReplaceNullValues";
-
- private String host;
- private Integer port;
- private String database;
- private String table;
-
- private String username;
- private String password;
-
-
- private List<Column> columns;
-
- Connection connection;
-
- MySqlClient(String host,
- int port,
- String database,
- String table,
- String username,
- String password) {
- this.host = host;
- this.port = port;
- this.database = database;
- this.table = table;
- this.username = username;
- this.password = password;
-
- connection = null;
- }
-
- public void connect() throws AdapterException {
- checkJdbcDriver();
- String server = "jdbc:mysql://" + host + ":" + port + "/" + "?sslMode=DISABLED&allowPublicKeyRetrieval=true";
- try {
- connection = DriverManager.getConnection(server, username, password);
- } catch (SQLException e) {
- throw new AdapterException("Could not connect to server: " + e.getMessage());
- }
- }
-
- public void disconnect() throws AdapterException {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- throw new AdapterException("Error while disconnecting: " + e.getMessage());
- }
- connection = null;
- }
- }
-
- public GuessSchema getSchema() throws AdapterException {
- connect();
- loadColumns();
-
- EventSchema eventSchema = new EventSchema();
- GuessSchema guessSchema = new GuessSchema();
- List<EventProperty> allProperties = new ArrayList<>();
-
- for (Column column : columns) {
- if (SO.DateTime.equals(column.getDomainProperty())) {
- allProperties.add(PrimitivePropertyBuilder
- .create(column.getType(), column.getName())
- .label(column.getName())
- .domainProperty(SO.DateTime)
- .build());
- } else {
- allProperties.add(PrimitivePropertyBuilder
- .create(column.getType(), column.getName())
- .label(column.getName())
- .build());
- }
- }
-
- eventSchema.setEventProperties(allProperties);
- guessSchema.setEventSchema(eventSchema);
-
- disconnect();
- return guessSchema;
- }
-
- /**
- * Checks that the MySql-JDBC-Driver is "installed". Throws an AdapterException otherwise
- */
- private void checkJdbcDriver() throws AdapterException {
- try {
- Class.forName("com.mysql.cj.jdbc.Driver");
- } catch (ClassNotFoundException e) {
- throw new AdapterException("MySql Driver not found.");
- }
- }
-
- /**
- * Fills the columns with the columns from the SQL Table
- */
- public void loadColumns() throws AdapterException {
- if (connection == null) {
- throw new AdapterException("Client must be connected in order to load the columns");
- }
- ResultSet resultSet = null;
- columns = new ArrayList<>();
-
- String query = "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_TYPE FROM "
- + "INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND TABLE_SCHEMA = ? ORDER BY "
- + "ORDINAL_POSITION ASC;";
-
- try (PreparedStatement statement = connection.prepareStatement(query)) {
-
- statement.setString(1, table);
- statement.setString(2, database);
- resultSet = statement.executeQuery();
-
- if (resultSet.next()) {
- do {
- String name = resultSet.getString("COLUMN_NAME");
- String dataType = resultSet.getString("DATA_TYPE");
- String columnType = resultSet.getString("COLUMN_TYPE");
- columns.add(new Column(name, dataType, columnType));
- } while(resultSet.next());
- } else {
- // No columns found -> Table/Database does not exist
- throw new IllegalArgumentException("Database/table not found");
- }
- } catch (SQLException e) {
- throw new AdapterException("SqlException while loading columns: " + e.getMessage()
- + ", Error code: " + e.getErrorCode()
- + ", SqlState: " + e.getSQLState());
- } finally {
- try {
- resultSet.close();
- } catch (Exception e) {}
- }
- }
-
- public String getHost() {
- return host;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public String getDatabase() {
- return database;
- }
-
- public String getTable() {
- return table;
- }
-
- public String getUsername() {
- return username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public List<Column> getColumns() {
- return columns;
- }
-
- public boolean isConnected() {
- return connection != null;
- }
-
- Connection getConnection() {
- return connection;
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
deleted file mode 100644
index 21ef041..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
+++ /dev/null
@@ -1,203 +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.streampipes.connect.adapters.mysql;
-
-import org.apache.streampipes.connect.adapter.Adapter;
-import org.apache.streampipes.connect.api.exception.AdapterException;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.connect.adapter.model.specific.SpecificDataSetAdapter;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.sdk.builder.adapter.SpecificDataSetAdapterBuilder;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.helpers.Options;
-import org.apache.streampipes.sdk.helpers.Tuple2;
-import org.apache.streampipes.sdk.utils.Assets;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MySqlSetAdapter extends SpecificDataSetAdapter {
-
- public static final String ID = "org.apache.streampipes.connect.adapters.mysql.set";
-
- private MySqlClient mySqlClient;
- private Thread fetchDataThread;
-
- private boolean replaceNullValues;
-
- public static class FetchDataThread implements Runnable {
-
- MySqlSetAdapter mySqlSetAdapter;
- MySqlClient mySqlClient;
-
- public FetchDataThread(MySqlSetAdapter mySqlSetAdapter) throws AdapterException {
- this.mySqlSetAdapter = mySqlSetAdapter;
- this.mySqlClient = mySqlSetAdapter.getMySqlClient();
-
- mySqlClient.connect();
- mySqlClient.loadColumns();
- }
-
- @Override
- public void run() {
- if (!mySqlClient.isConnected()) {
- System.out.println("Cannot start PollingThread, when the client is not connected");
- return;
- }
- // No batch approach like in the influx adapter due to the lack of a unique key in the table
- // Create the columnString:
- StringBuilder sb = new StringBuilder();
- for (Column column : mySqlClient.getColumns()) {
- sb.append(column.getName()).append(", ");
- }
- sb.setLength(Math.max(0, sb.length() - 2));
-
- String query = "SELECT " + sb.toString() + " FROM " + mySqlClient.getDatabase() + "." + mySqlClient.getTable();
-
- try (Statement statement = mySqlClient.getConnection().createStatement()) {
- boolean executed = statement.execute(query);
- if (executed) {
- ResultSet resultSet = statement.getResultSet();
- while (resultSet.next()) {
-
- // Retrieve by column name
- Map<String, Object> event = new HashMap<>();
- for (Column column : mySqlClient.getColumns()) {
- Object in = resultSet.getObject(column.getName());
- if (in == null) {
- if (mySqlSetAdapter.replaceNullValues) {
- in = column.getDefault();
- } else {
- // We do not want to send this event (replaceNullValues == false)
- event = null;
- break;
- }
- }
- event.put(column.getName(), in);
- }
- if (event != null) {
- mySqlSetAdapter.send(event);
- }
- }
- resultSet.close();
- }
- } catch (SQLException e) {
- System.out.println(e.getMessage());
- }
-
- try {
- mySqlClient.disconnect();
- } catch (AdapterException e) {
- e.printStackTrace();
- }
- }
- }
-
- public MySqlSetAdapter() {
- }
-
- public MySqlSetAdapter(SpecificAdapterSetDescription adapterDescription) {
- super(adapterDescription);
-
- getConfigurations(adapterDescription);
- }
-
-
- @Override
- public SpecificAdapterSetDescription declareModel() {
- SpecificAdapterSetDescription description = SpecificDataSetAdapterBuilder.create(ID)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
- .withLocales(Locales.EN)
- .requiredTextParameter(Labels.withId(MySqlClient.HOST))
- .requiredIntegerParameter(Labels.withId(MySqlClient.PORT), 3306)
- .requiredTextParameter(Labels.withId(MySqlClient.DATABASE))
- .requiredTextParameter(Labels.withId(MySqlClient.TABLE))
- .requiredTextParameter(Labels.withId(MySqlClient.USER))
- .requiredSecret(Labels.withId(MySqlClient.PASSWORD))
- .requiredSingleValueSelection(Labels.withId(MySqlClient.REPLACE_NULL_VALUES),
- Options.from(
- new Tuple2<>("Yes", MySqlClient.DO_REPLACE_NULL_VALUES),
- new Tuple2<>("No", MySqlClient.DO_NOT_REPLACE_NULL_VALUES)))
- .build();
-
- description.setAppId(ID);
- return description;
- }
-
- @Override
- public void startAdapter() throws AdapterException {
- fetchDataThread = new Thread(new FetchDataThread(this));
- fetchDataThread.start();
- }
-
- @Override
- public void stopAdapter() throws AdapterException {
- fetchDataThread.interrupt();
- try {
- fetchDataThread.join();
- } catch (InterruptedException e) {
- throw new AdapterException("Unexpected Error while joining polling thread: " + e.getMessage());
- }
- }
-
- @Override
- public Adapter getInstance(SpecificAdapterSetDescription adapterDescription) {
- return new MySqlSetAdapter(adapterDescription);
- }
-
- @Override
- public GuessSchema getSchema(SpecificAdapterSetDescription adapterDescription) throws AdapterException, ParseException {
- getConfigurations(adapterDescription);
- return mySqlClient.getSchema();
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- private void send(Map<String, Object> map) {
- adapterPipeline.process(map);
- }
-
- private void getConfigurations(SpecificAdapterSetDescription adapterDescription) {
- ParameterExtractor extractor = new ParameterExtractor(adapterDescription.getConfig());
-
- String replace = extractor.selectedSingleValueInternalName(MySqlClient.REPLACE_NULL_VALUES);
- replaceNullValues = replace.equals(MySqlClient.DO_REPLACE_NULL_VALUES);
-
- mySqlClient = new MySqlClient(
- extractor.singleValue(MySqlClient.HOST, String.class),
- extractor.singleValue(MySqlClient.PORT, Integer.class),
- extractor.singleValue(MySqlClient.DATABASE, String.class),
- extractor.singleValue(MySqlClient.TABLE, String.class),
- extractor.singleValue(MySqlClient.USER, String.class),
- extractor.secretValue(MySqlClient.PASSWORD));
- }
-
- public MySqlClient getMySqlClient() {
- return mySqlClient;
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
deleted file mode 100644
index b6dbf45..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
+++ /dev/null
@@ -1,201 +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.streampipes.connect.adapters.mysql;
-
-import com.github.shyiko.mysql.binlog.BinaryLogClient;
-import com.github.shyiko.mysql.binlog.event.*;
-import com.github.shyiko.mysql.binlog.event.deserialization.EventDeserializer;
-import org.apache.streampipes.connect.adapter.Adapter;
-import org.apache.streampipes.connect.api.exception.AdapterException;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.helpers.Options;
-import org.apache.streampipes.sdk.helpers.Tuple2;
-import org.apache.streampipes.sdk.utils.Assets;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MySqlStreamAdapter extends SpecificDataStreamAdapter {
-
- public static final String ID = "org.apache.streampipes.connect.adapters.mysql.stream";
-
- private MySqlClient mySqlClient;
- private BinaryLogClient binaryLogClient;
-
- private Thread subscriptionThread = new Thread(()-> {
- try {
- binaryLogClient.connect();
- } catch (IOException e) {
- e.printStackTrace();
- }
- });
-
- private boolean replaceNullValues;
- private boolean dataComing = false;
-
- public MySqlStreamAdapter() {
- }
-
- public MySqlStreamAdapter(SpecificAdapterStreamDescription adapterDescription) {
- super(adapterDescription);
-
- getConfigurations(adapterDescription);
- }
-
- @Override
- public SpecificAdapterStreamDescription declareModel() {
- SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(ID)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
- .withLocales(Locales.EN)
- .requiredTextParameter(Labels.withId(MySqlClient.HOST))
- .requiredIntegerParameter(Labels.withId(MySqlClient.PORT), 3306)
- .requiredTextParameter(Labels.withId(MySqlClient.DATABASE))
- .requiredTextParameter(Labels.withId(MySqlClient.TABLE))
- .requiredTextParameter(Labels.withId(MySqlClient.USER))
- .requiredSecret(Labels.withId(MySqlClient.PASSWORD))
- .requiredSingleValueSelection(Labels.withId(MySqlClient.REPLACE_NULL_VALUES),
- Options.from(
- new Tuple2<>("Yes", MySqlClient.DO_REPLACE_NULL_VALUES),
- new Tuple2<>("No", MySqlClient.DO_NOT_REPLACE_NULL_VALUES)))
- .build();
-
- description.setAppId(ID);
- return description;
- }
-
- @Override
- public void startAdapter() throws AdapterException {
- // Making sure, that the columns are all loaded
- mySqlClient.connect();
- mySqlClient.loadColumns();
- mySqlClient.disconnect();
-
- // Connect BinaryLogClient
- binaryLogClient = new BinaryLogClient(
- mySqlClient.getHost(),
- mySqlClient.getPort(),
- mySqlClient.getUsername(),
- mySqlClient.getPassword());
-
- EventDeserializer eventDeserializer = new EventDeserializer();
- eventDeserializer.setCompatibilityMode(
- EventDeserializer.CompatibilityMode.DATE_AND_TIME_AS_LONG,
- EventDeserializer.CompatibilityMode.CHAR_AND_BINARY_AS_BYTE_ARRAY
- );
- binaryLogClient.setEventDeserializer(eventDeserializer);
- binaryLogClient.registerEventListener(event -> sendEvent(event));
- subscriptionThread.start();
- }
-
-
- private void sendEvent(Event event) {
- // An event can contain multiple insertions/updates
- if (event.getHeader().getEventType() == EventType.TABLE_MAP) {
- // Check table and database, if the next event should be streamed
- if (((TableMapEventData) event.getData()).getDatabase().equals(mySqlClient.getDatabase())
- && ((TableMapEventData) event.getData()).getTable().equals((mySqlClient.getTable()))) {
- dataComing = true;
- }
- }
- if (dataComing) {
- if (EventType.isUpdate(event.getHeader().getEventType())) {
- for (Map.Entry<Serializable[], Serializable[]> en : ((UpdateRowsEventData) event.getData()).getRows()) {
- sendChange(en.getValue());
- }
- dataComing = false;
- } else if (EventType.isWrite(event.getHeader().getEventType())) {
- for (Serializable[] s : ((WriteRowsEventData) event.getData()).getRows()) {
- sendChange(s);
- }
- dataComing = false;
- }
- }
- }
-
- private void sendChange(Serializable[] rows) {
- Map<String, Object> out = new HashMap<>();
- for (int i = 0; i < rows.length; i++) {
- if (rows[i] != null) {
- if (rows[i] instanceof byte[]) {
- // Strings are sent in byte arrays and have to be converted.
- //TODO: Check that encoding is correct
- out.put(mySqlClient.getColumns().get(i).getName(), new String((byte[])rows[i]));
- } else {
- out.put(mySqlClient.getColumns().get(i).getName(), rows[i]);
- }
- } else if (replaceNullValues) {
- out.put(mySqlClient.getColumns().get(i).getName(), mySqlClient.getColumns().get(i).getDefault());
- } else {
- // We should skip events with null values
- return;
- }
- }
- adapterPipeline.process(out);
- }
-
- @Override
- public void stopAdapter() throws AdapterException {
- try {
- binaryLogClient.disconnect();
- subscriptionThread.join();
- } catch (IOException | InterruptedException e) {
- throw new AdapterException("Thrown exception: " + e.getMessage());
- }
- }
-
- @Override
- public Adapter getInstance(SpecificAdapterStreamDescription adapterDescription) {
- return new MySqlStreamAdapter(adapterDescription);
- }
-
- @Override
- public GuessSchema getSchema(SpecificAdapterStreamDescription adapterDescription) throws AdapterException, ParseException {
- getConfigurations(adapterDescription);
- return mySqlClient.getSchema();
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- private void getConfigurations(SpecificAdapterStreamDescription adapterDescription) {
- ParameterExtractor extractor = new ParameterExtractor(adapterDescription.getConfig());
-
- String replace = extractor.selectedSingleValueInternalName(MySqlClient.REPLACE_NULL_VALUES);
- replaceNullValues = replace.equals(MySqlClient.DO_REPLACE_NULL_VALUES);
-
- mySqlClient = new MySqlClient(
- extractor.singleValue(MySqlClient.HOST, String.class),
- extractor.singleValue(MySqlClient.PORT, Integer.class),
- extractor.singleValue(MySqlClient.DATABASE, String.class),
- extractor.singleValue(MySqlClient.TABLE, String.class),
- extractor.singleValue(MySqlClient.USER, String.class),
- extractor.secretValue(MySqlClient.PASSWORD));
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
deleted file mode 100644
index 2f31723..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
+++ /dev/null
@@ -1,69 +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.streampipes.connect.protocol.stream;
-
-import org.apache.streampipes.connect.adapter.guess.SchemaGuesser;
-import org.apache.streampipes.connect.adapter.model.generic.Protocol;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.model.schema.EventSchema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public abstract class BrokerProtocol extends Protocol {
-
- protected String brokerUrl;
- protected String topic;
-
- public BrokerProtocol() {
-
- }
-
- public BrokerProtocol(IParser parser, IFormat format, String brokerUrl, String topic) {
- super(parser, format);
- this.brokerUrl = brokerUrl;
- this.topic = topic;
- }
-
- @Override
- public GuessSchema getGuessSchema() throws ParseException {
-
- List<byte[]> eventByte = getNByteElements(1);
- EventSchema eventSchema = parser.getEventSchema(eventByte);
-
- return SchemaGuesser.guessSchma(eventSchema);
- }
-
- @Override
- public List<Map<String, Object>> getNElements(int n) throws ParseException {
- List<byte[]> resultEventsByte = getNByteElements(n);
- List<Map<String, Object>> result = new ArrayList<>();
- for (byte[] event : resultEventsByte) {
- result.add(format.parse(event));
- }
-
- return result;
- }
-
- protected abstract List<byte[]> getNByteElements(int n) throws ParseException;
-
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
deleted file mode 100644
index 4be896b..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
+++ /dev/null
@@ -1,137 +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.streampipes.connect.protocol.stream;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.streampipes.connect.SendToPipeline;
-import org.apache.streampipes.connect.adapter.model.generic.Protocol;
-import org.apache.streampipes.connect.api.IAdapterPipeline;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.connect.utils.MqttConnectUtils;
-import org.apache.streampipes.messaging.InternalEventProcessor;
-import org.apache.streampipes.model.AdapterType;
-import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
-import org.apache.streampipes.sdk.extractor.StaticPropertyExtractor;
-import org.apache.streampipes.sdk.helpers.AdapterSourceType;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MqttProtocol extends BrokerProtocol {
-
- public static final String ID = "org.apache.streampipes.connect.protocol.stream.mqtt";
-
- private Thread thread;
- private MqttConsumer mqttConsumer;
- private MqttConfig mqttConfig;
-
- public MqttProtocol() {
- }
-
- public MqttProtocol(IParser parser, IFormat format, MqttConfig mqttConfig) {
- super(parser, format, mqttConfig.getUrl(), mqttConfig.getTopic());
- this.mqttConfig = mqttConfig;
- }
-
- @Override
- public Protocol getInstance(ProtocolDescription protocolDescription, IParser parser, IFormat format) {
- MqttConfig mqttConfig;
- StaticPropertyExtractor extractor =
- StaticPropertyExtractor.from(protocolDescription.getConfig(), new ArrayList<>());
-
- mqttConfig = MqttConnectUtils.getMqttConfig(extractor);
-
- return new MqttProtocol(parser, format, mqttConfig);
- }
-
- @Override
- public ProtocolDescription declareModel() {
- return ProtocolDescriptionBuilder.create(ID)
- .withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
- .category(AdapterType.Generic, AdapterType.Manufacturing)
- .sourceType(AdapterSourceType.STREAM)
- .requiredTextParameter(MqttConnectUtils.getBrokerUrlLabel())
- .requiredAlternatives(MqttConnectUtils.getAccessModeLabel(), MqttConnectUtils.getAlternativesOne(), MqttConnectUtils.getAlternativesTwo())
- .requiredTextParameter(MqttConnectUtils.getTopicLabel())
- .build();
- }
-
- @Override
- protected List<byte[]> getNByteElements(int n) throws ParseException {
- List<byte[]> elements = new ArrayList<>();
- InternalEventProcessor<byte[]> eventProcessor = elements::add;
-
- MqttConsumer consumer = new MqttConsumer(this.mqttConfig, eventProcessor);
-
- Thread thread = new Thread(consumer);
- thread.start();
-
- while (consumer.getMessageCount() < n) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- return elements;
- }
-
- @Override
- public void run(IAdapterPipeline adapterPipeline) {
- SendToPipeline stk = new SendToPipeline(format, adapterPipeline);
- this.mqttConsumer = new MqttConsumer(this.mqttConfig, new MqttProtocol.EventProcessor(stk));
-
- thread = new Thread(this.mqttConsumer);
- thread.start();
- }
-
- @Override
- public void stop() {
- this.mqttConsumer.close();
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- private class EventProcessor implements InternalEventProcessor<byte[]> {
- private SendToPipeline stk;
-
- public EventProcessor(SendToPipeline stk) {
- this.stk = stk;
- }
-
- @Override
- public void onEvent(byte[] payload) {
- try {
- parser.parse(IOUtils.toInputStream(new String(payload), "UTF-8"), stk);
- } catch (IOException | ParseException e) {
- e.printStackTrace();
- //logger.error("Adapter " + ID + " could not read value!",e);
- }
- }
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java
deleted file mode 100644
index be74977..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java
+++ /dev/null
@@ -1,98 +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.streampipes.connect.protocol.stream;
-
-import org.apache.streampipes.connect.SendToPipeline;
-import org.apache.streampipes.connect.adapter.model.generic.Protocol;
-import org.apache.streampipes.connect.api.IAdapterPipeline;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.InputStream;
-import java.util.concurrent.*;
-
-public abstract class PullProtocol extends Protocol {
-
- private ScheduledExecutorService scheduler;
-
- private Logger logger = LoggerFactory.getLogger(PullProtocol.class);
-
- private long interval;
-
-
- public PullProtocol() {
- }
-
- public PullProtocol(IParser parser, IFormat format, long interval) {
- super(parser, format);
- this.interval = interval;
- }
-
- @Override
- public void run(IAdapterPipeline adapterPipeline) {
- final Runnable errorThread = () -> {
- executeProtocolLogic(adapterPipeline);
- };
-
-
- scheduler = Executors.newScheduledThreadPool(1);
- scheduler.schedule(errorThread, 0, TimeUnit.MILLISECONDS);
-
- }
-
-
- private void executeProtocolLogic(IAdapterPipeline adapterPipeline) {
- final Runnable task = () -> {
-
- format.reset();
- SendToPipeline stk = new SendToPipeline(format, adapterPipeline);
- try {
- InputStream data = getDataFromEndpoint();
- if(data != null) {
- parser.parse(data, stk);
- } else {
- logger.warn("Could not receive data from Endpoint. Try again in " + interval + " seconds.");
- }
- } catch (ParseException e) {
- logger.error("Error while parsing: " + e.getMessage());
- }
-
-
- };
-
- scheduler = Executors.newScheduledThreadPool(1);
- ScheduledFuture<?> handle = scheduler.scheduleAtFixedRate(task, 1, interval, TimeUnit.SECONDS);
- try {
- handle.get();
- } catch (ExecutionException e ) {
- logger.error("Error", e);
- } catch (InterruptedException e) {
- logger.error("Error", e);
- }
- }
-
- @Override
- public void stop() {
- scheduler.shutdownNow();
- }
-
- abstract InputStream getDataFromEndpoint() throws ParseException;
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java
deleted file mode 100644
index 05ade03..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java
+++ /dev/null
@@ -1,88 +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.streampipes.connect.protocol.stream.pulsar;
-
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.pulsar.client.api.SubscriptionType;
-import org.apache.streampipes.messaging.InternalEventProcessor;
-
-public class PulsarConsumer implements Runnable {
-
- private InternalEventProcessor<byte[]> adapterConsumer;
- private String brokerUrl;
- private String topic;
- private Integer maxElementsToReceive = -1;
- private Integer messageCount = 0;
- private Boolean running = true;
-
- private PulsarClient pulsarClient;
-
-
- public PulsarConsumer(String brokerUrl, String topic, InternalEventProcessor<byte[]> adapterConsumer) {
- this.brokerUrl = brokerUrl;
- this.topic = topic;
- this.adapterConsumer = adapterConsumer;
- }
-
- public PulsarConsumer(String brokerUrl, String topic, InternalEventProcessor<byte[]> adapterConsumer,
- int maxElementsToReceive) {
- this(brokerUrl, topic, adapterConsumer);
- this.maxElementsToReceive = maxElementsToReceive;
- }
-
- @Override
- public void run() {
- this.running = true;
- try {
- this.pulsarClient = PulsarUtils.makePulsarClient(this.brokerUrl);
-
- Consumer<byte[]> consumer = this.pulsarClient.newConsumer()
- .topic(this.topic)
- .subscriptionName(RandomStringUtils.randomAlphanumeric(10))
- .subscriptionType(SubscriptionType.Shared)
- .subscribe();
-
- while (running && ((maxElementsToReceive == -1) || (this.messageCount <= maxElementsToReceive))) {
- Message msg = consumer.receive();
- adapterConsumer.onEvent(msg.getData());
- consumer.acknowledge(msg);
- this.messageCount++;
- }
-
- consumer.close();
- this.pulsarClient.close();
- } catch (PulsarClientException e) {
- e.printStackTrace();
- }
- }
-
- public void stop() throws PulsarClientException {
- this.running = false;
- this.pulsarClient.close();
- }
-
- public Integer getMessageCount() {
- return this.messageCount;
- }
-
-
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
deleted file mode 100644
index 2ddb0e9..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
+++ /dev/null
@@ -1,149 +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.streampipes.connect.protocol.stream.pulsar;
-
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.streampipes.connect.SendToPipeline;
-import org.apache.streampipes.connect.adapter.model.generic.Protocol;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.connect.api.IAdapterPipeline;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.connect.protocol.stream.BrokerProtocol;
-import org.apache.streampipes.container.api.ResolvesContainerProvidedOptions;
-import org.apache.streampipes.messaging.InternalEventProcessor;
-import org.apache.streampipes.model.AdapterType;
-import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.model.staticproperty.Option;
-import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
-import org.apache.streampipes.sdk.extractor.StaticPropertyExtractor;
-import org.apache.streampipes.sdk.helpers.AdapterSourceType;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PulsarProtocol extends BrokerProtocol implements ResolvesContainerProvidedOptions {
-
- private static final Logger LOG = LoggerFactory.getLogger(PulsarProtocol.class);
-
- public static final String ID = "org.apache.streampipes.connect.protocol.stream.pulsar";
-
- private static final String PULSAR_BROKER_HOST = "pulsar-broker-host";
- private static final String PULSAR_BROKER_PORT = "pulsar-broker-port";
- private static final String PULSAR_TOPIC = "pulsar-topic";
-
- private Thread thread;
- private PulsarConsumer pulsarConsumer;
-
- public PulsarProtocol() {
-
- }
-
- public PulsarProtocol(IParser parser, IFormat format, String brokerUrl, String topic) {
- super(parser, format, brokerUrl, topic);
- }
-
- @Override
- protected List<byte[]> getNByteElements(int n) throws ParseException {
- List<byte[]> elements = new ArrayList<>();
- InternalEventProcessor<byte[]> eventProcessor = elements::add;
- PulsarConsumer consumer = new PulsarConsumer(this.brokerUrl, this.topic, eventProcessor, n);
-
- Thread thread = new Thread(consumer);
- thread.start();
-
- while (consumer.getMessageCount() < n) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- return elements;
- }
-
- @Override
- public Protocol getInstance(ProtocolDescription protocolDescription, IParser parser, IFormat format) {
- ParameterExtractor extractor = new ParameterExtractor(protocolDescription.getConfig());
- String brokerHost = extractor.singleValue(PULSAR_BROKER_HOST, String.class);
- Integer brokerPort = extractor.singleValue(PULSAR_BROKER_PORT, Integer.class);
- String brokerUrl = brokerHost + ":" + brokerPort;
- String topic = extractor.singleValue(PULSAR_TOPIC, String.class);
-
- return new PulsarProtocol(parser, format, brokerUrl, topic);
- }
-
- @Override
- public ProtocolDescription declareModel() {
- return ProtocolDescriptionBuilder.create(ID)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
- .withLocales(Locales.EN)
- .category(AdapterType.Generic)
- .sourceType(AdapterSourceType.STREAM)
- .requiredTextParameter(Labels.withId(PULSAR_BROKER_HOST))
- .requiredIntegerParameter(Labels.withId(PULSAR_BROKER_PORT), 6650)
- .requiredTextParameter(Labels.withId(PULSAR_TOPIC))
-// .requiredSingleValueSelectionFromContainer(Labels.from(PULSAR_TOPIC, "Topic",
-// "Example: topic"), Arrays.asList(PULSAR_BROKER_HOST, PULSAR_BROKER_PORT))
- .build();
- }
-
- @Override
- public void run(IAdapterPipeline adapterPipeline) {
- SendToPipeline stk = new SendToPipeline(format, adapterPipeline);
- this.pulsarConsumer = new PulsarConsumer(this.brokerUrl,
- this.topic, stk::emit);
-
- thread = new Thread(this.pulsarConsumer);
- thread.start();
- }
-
- @Override
- public void stop() {
- try {
- this.pulsarConsumer.stop();
- } catch (PulsarClientException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- @Override
- public List<Option> resolveOptions(String requestId, StaticPropertyExtractor extractor) {
- String brokerHost = extractor.singleValueParameter(PULSAR_BROKER_HOST, String.class);
- Integer brokerPort = extractor.singleValueParameter(PULSAR_BROKER_PORT, Integer.class);
-
- try {
- PulsarClient client = PulsarUtils.makePulsarClient(brokerHost + ":" + brokerPort);
- return new ArrayList<>();
- } catch (PulsarClientException e) {
- return new ArrayList<>();
- }
- }
-}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java
deleted file mode 100644
index 117311a..0000000
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java
+++ /dev/null
@@ -1,33 +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.streampipes.connect.protocol.stream.pulsar;
-
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
-
-public class PulsarUtils {
-
- private static final String PULSAR_SCHEME = "pulsar://";
-
- public static PulsarClient makePulsarClient(String brokerHostname) throws PulsarClientException {
- String serviceUrl = PULSAR_SCHEME + brokerHostname;
- return PulsarClient.builder()
- .serviceUrl(serviceUrl)
- .build();
- }
-}
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/documentation.md
deleted file mode 100644
index e943bff..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/documentation.md
+++ /dev/null
@@ -1,35 +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.
- ~
- -->
-
-## InfluxDB Set Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-Creates a data set for an InfluxDB measurement.
-
-***
-
-## Configuration
-
-
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/icon.png
deleted file mode 100644
index 1f9bb88..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/strings.en
deleted file mode 100644
index 7deaf5d..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.set/strings.en
+++ /dev/null
@@ -1,23 +0,0 @@
-org.apache.streampipes.connect.adapters.influxdb.set.title=InfluxDB Set Adapter
-org.apache.streampipes.connect.adapters.influxdb.set.description=Creates a data set for an InfluxDB measurement
-
-influxDbHost.title=Hostname
-influxDbHost.description=Hostname of the InfluxDB Server
-
-influxDbPort.title=Port
-influxDbPort.description=Port of the InfluxDB Server
-
-influxDbDatabase.title=Database
-influxDbDatabase.description=Name of the database
-
-influxDbMeasurement.title=Measurement
-influxDbMeasurement.description=Name of the measurement which should be observed
-
-influxDbUsername.title=Username
-influxDbUsername.description=The username to log into the InfluxDB
-
-influxDbPassword.title=Password
-influxDbPassword.description=The password to log into the InfluxDB
-
-replaceNullValues.title=Replace Null Values
-replaceNullValues.description=Should null values in the incoming data be replace by defaults? If not, these events are skipped
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/documentation.md
deleted file mode 100644
index 25032ce..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/documentation.md
+++ /dev/null
@@ -1,35 +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.
- ~
- -->
-
-## InfluxDB Stream Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-Creates a data stream for an InfluxDB measurement.
-
-***
-
-## Configuration
-
-
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/icon.png
deleted file mode 100644
index 1f9bb88..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/strings.en
deleted file mode 100644
index 425c03b..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.influxdb.stream/strings.en
+++ /dev/null
@@ -1,26 +0,0 @@
-org.apache.streampipes.connect.adapters.influxdb.stream.title=InfluxDB Stream Adapter
-org.apache.streampipes.connect.adapters.influxdb.stream.description=Creates a data stream for an InfluxDB measurement
-
-influxDbHost.title=Hostname
-influxDbHost.description=Hostname of the InfluxDB Server (needs an "http://" in front)
-
-influxDbPort.title=Port
-influxDbPort.description=Port of the InfluxDB Server (e.g. 8086)
-
-influxDbDatabase.title=Database
-influxDbDatabase.description=Name of the database
-
-influxDbMeasurement.title=Measurement
-influxDbMeasurement.description=Name of the measurement which should be observed
-
-influxDbUsername.title=Username
-influxDbUsername.description=The username to log into the InfluxDB
-
-influxDbPassword.title=Password
-influxDbPassword.description=The password to log into the InfluxDB
-
-replaceNullValues.title=Replace Null Values
-replaceNullValues.description=Should null values in the incoming data be replace by defaults? If not, these events are skipped
-
-pollingInterval.title=Polling interval (MS)
-pollingInterval.description=How often the database should be checked for new entries (in MS)
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/documentation.md
deleted file mode 100644
index add7783..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## MySQL Data Set Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Creates a data set from an SQL table
-
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/icon.png
deleted file mode 100644
index 084246f..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/strings.en
deleted file mode 100644
index b710ede..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.set/strings.en
+++ /dev/null
@@ -1,23 +0,0 @@
-org.apache.streampipes.connect.adapters.mysql.set.title=MySQL Set Adapter
-org.apache.streampipes.connect.adapters.mysql.set.description=Creates a data set from an SQL table
-
-mysqlHost.title=Hostname
-mysqlHost.description=Hostname of the MySql Server
-
-mysqlPort.title=Port
-mysqlPort.description=Port of the MySql Server. Default: 3306
-
-mysqlDatabase.title=Database
-mysqlDatabase.description=Database in which the table is located
-
-mysqlTable.title=Table
-mysqlTable.description=Table which should be watched
-
-mysqlUser.title=Username
-mysqlUser.description=Username of the user
-
-mysqlPassword.title=Password
-mysqlPassword.description=Password of the user
-
-replaceNullValues.title=Replace Null Values
-replaceNullValues.description=Should null values in the incoming data be replace by defaults? If not, these events are skipped
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/documentation.md
deleted file mode 100644
index 9704ffd..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## MySQL Data Stream Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Creates a data stream for a SQL table
-
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/icon.png
deleted file mode 100644
index 084246f..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/strings.en
deleted file mode 100644
index 48690e1..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.mysql.stream/strings.en
+++ /dev/null
@@ -1,24 +0,0 @@
-org.apache.streampipes.connect.adapters.mysql.stream.title=MySql Stream Adapter
-org.apache.streampipes.connect.adapters.mysql.stream.description=Creates a data stream for a SQL table
-
-
-mysqlHost.title=Hostname
-mysqlHost.description=Hostname of the MySql Server
-
-mysqlPort.title=Port
-mysqlPort.description=Port of the MySql Server. Default: 3306
-
-mysqlDatabase.title=Database
-mysqlDatabase.description=Database in which the table is located
-
-mysqlTable.title=Table
-mysqlTable.description=Table which should be watched
-
-mysqlUser.title=Username
-mysqlUser.description=Username of the user
-
-mysqlPassword.title=Password
-mysqlPassword.description=Password of the user
-
-replaceNullValues.title=Replace Null Values
-replaceNullValues.description=Should null values in the incoming data be replace by defaults? If not, these events are skipped
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md
deleted file mode 100644
index 1fb5573..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md
+++ /dev/null
@@ -1,58 +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.
- ~
- -->
-
-## Ros Bridge
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Connect Robots running on ROS
-
-
-***
-
-## Required input
-
-This sink does not have any requirements and works with any incoming event type.
-
-***
-
-## Configuration
-
-Describe the configuration parameters here
-
-### Ros Bridge
-
-Example: test-server.com (No protocol)
-
-### Port
-
-The port of the ROS instance.
-
-### Topic
-
-Example: /battery (Starts with /)
-
-
-## Output
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png
deleted file mode 100644
index b202048..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en
deleted file mode 100644
index 6682d1e..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en
+++ /dev/null
@@ -1,27 +0,0 @@
-org.apache.streampipes.connect.adapters.netio.mqtt.title=NETIO MQTT M2M
-org.apache.streampipes.connect.adapters.netio.mqtt.description=Connect a NETIO power plugs over MQTT
-
-access-mode.title=Access Mode
-access-mode.description=
-
-anonymous-alternative.title=Unauthenticated
-anonymous-alternative.description=
-
-username-alternative.title=Username/Password
-username-alternative.description=
-
-username-group.title=User Group
-username-group.description=
-
-username.title=Username
-username.description=
-
-password.title=Password
-password.description=
-
-broker_url.title=Broker URL
-broker_url.description=Example: tcp://test-server.com:1883 (Protocol required. Port required)"
-
-topic.title=Topic
-topic.description=Example: test/topic
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md
deleted file mode 100644
index 1fb5573..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md
+++ /dev/null
@@ -1,58 +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.
- ~
- -->
-
-## Ros Bridge
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Connect Robots running on ROS
-
-
-***
-
-## Required input
-
-This sink does not have any requirements and works with any incoming event type.
-
-***
-
-## Configuration
-
-Describe the configuration parameters here
-
-### Ros Bridge
-
-Example: test-server.com (No protocol)
-
-### Port
-
-The port of the ROS instance.
-
-### Topic
-
-Example: /battery (Starts with /)
-
-
-## Output
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png
deleted file mode 100644
index b202048..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en
deleted file mode 100644
index fd35347..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en
+++ /dev/null
@@ -1,14 +0,0 @@
-org.apache.streampipes.connect.adapters.netio.rest.title=NETIO http JSON
-org.apache.streampipes.connect.adapters.netio.rest.description=Connect a NETIO REST power plug
-
-NETIO_IP.title=Netio endpoint
-NETIO_IP.description=Example: 192.168.34.56
-
-NETIO_USERNAME.title=Username
-NETIO_USERNAME.description=Can be configured over the NETIO configurations
-
-NETIO_PASSWORD.title=Password
-NETIO_PASSWORD.description=Can be configured over the NETIO configurations
-
-NETIO_POLLING_INTERVAL.title=Polling Interval [s]
-NETIO_POLLING_INTERVAL.description=Polling interval in seconds
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/documentation.md
deleted file mode 100644
index b9c718e..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## NSW Traffic Cameras
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Traffic camera images produced by NSW Australia
-
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/icon.png
deleted file mode 100644
index f9ab06c..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/strings.en
deleted file mode 100644
index 92b409e..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera/strings.en
+++ /dev/null
@@ -1,6 +0,0 @@
-org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera.title=NSW Traffic Cameras
-org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera.description=Traffic camera images produced by NSW Australia
-
-
-api-key.title=API Key
-api-key.description=The TfNSW API key
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/documentation.md
deleted file mode 100644
index 75b3eac..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/documentation.md
+++ /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 and
- ~ limitations under the License.
- ~
- -->
-
-## OPC-UA Pull Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Reads values from an OPC-UA server repeatedly
-
-***
-
-## Required Input
-
-***
-
-## Configuration
-
-### Polling Interval
-
-Duration of the polling interval in seconds
-
-### Anonymous vs. Username/Password
-
-Choose whether you want to connect anonymously or authenticate using your credentials.
-
- **Anonymous**: No further information required <br>
- **Username/Password**: Insert your `username` and `password` to access the OPC UA server
-
-### OPC UA Server
-
-Where can the OPC UA server be found?
-
- **URL**: Specify the server's full `URL` (including port), can be with our without leading `opc.tcp://`<br>
- **Host/Port**: Insert the `host` address (with or without leading `opc.tcp://`) and the `port`<br>
-
-### Namespace Index
-
-Requires the index of the namespace you want to connect to.
-
-### Node ID
-
-The identifier of the node you want to read from, numbers and strings are both valid.
-
-### Available Nodes
-
-Shows all available nodes once namespace index and node ID are given.
-Select as much as you like to query.
-
-***
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/icon.png
deleted file mode 100644
index ab68d43..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/strings.en
deleted file mode 100644
index 006543d..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.opcua/strings.en
+++ /dev/null
@@ -1,58 +0,0 @@
-org.apache.streampipes.connect.adapters.opcua.title=OPC UA
-org.apache.streampipes.connect.adapters.opcua.description=Reads values from an OPC-UA server
-
-
-OPC_HOST_OR_URL.title=OPC Server
-OPC_HOST_OR_URL.description=
-
-OPC_URL.title=URL
-OPC_URL.description=
-
-OPC_HOST.title=Host/Port
-OPC_HOST.description=
-
-OPC_SERVER_URL.title=URL
-OPC_SERVER_URL.description=Example: opc.tcp://test-server.com:4840,
-
-OPC_SERVER_HOST.title=Host
-OPC_SERVER_HOST.description=Example: test-server.com, opc.tcp://test-server.com)
-
-OPC_SERVER_PORT.title=Port
-OPC_SERVER_PORT.description=Example: 4840
-
-NAMESPACE_INDEX.title=Namespace Index
-NAMESPACE.INDEX.description=Example: 2
-
-NODE_ID.title=Node ID
-NODE_ID.description=Id of the Node to read the values from
-
-
-ACCESS_MODE.title=Security Level
-ACCESS_MODE.description=Select the OPC UA security level for the connection
-
-USERNAME_GROUP.title=Sign (username & password)
-USERNAME_GROUP.description=
-
-UNAUTHENTICATED.title=None
-UNAUTHENTICATED.description=
-
-USERNAME.title=Username
-USERNAME.description=
-
-PASSWORD.title=Password
-PASSWORD.description=
-
-AVAILABLE_NODES.title=Available Nodes
-AVAILABLE_NODES.description=Select the nodes that are relevant for you. Please ensure to select one option each for access mode and OPC UA server and to specify the polling interval
-
-PULLING_INTERVAL.title=Pull Interval
-PULLING_INTERVAL.description=Timespan between data retrieval, in milliseconds
-
-ADAPTER_TYPE.title=Adapter Type
-ADAPTER_TYPE.description=Select whether the adapter pulls data regularly or listens to subscriptions
-
-PULL_MODE.title=Pull mode
-PULL_MODE.description=
-
-SUBSCRIPTION_MODE.title=Subscription mode
-SUBSCRIPTION_MODE.description=
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/documentation.md
deleted file mode 100644
index c3da505..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## ISS Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Shows the live position of the International Space Station (ISS), updated every two seconds.
-
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/icon.png
deleted file mode 100644
index cfb6339..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/strings.en
deleted file mode 100644
index 7af43d5..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.modbus/strings.en
+++ /dev/null
@@ -1,45 +0,0 @@
-org.apache.streampipes.connect.adapters.plc4x.modbus.title=PLC4X MODBUS
-org.apache.streampipes.connect.adapters.plc4x.modbus.description=Connect directly to your MODBUS PLC
-
-plc_ip.title=PLC Address
-plc_ip.description=Example: 192.168.34.56
-
-plc_port.title=PLC Port
-plc_port.description=Example: 502
-
-configure.title=Configuration
-configure.description=
-
-manually.title=Enter Manually
-manually.description=Enter the addresses to read the data from manually
-
-plc_nodes.title=Nodes
-plc_nodes.description=Define the nodes of the PLC
-
-plc_node_runtime_name.title=Runtime Name
-plc_node_runtime_name.description=Example: temperature
-
-plc_node_name.title=Node Name
-plc_node_name.description=
-
-plc_node_type.title=Object Type
-plc_node_type.description=Example: Coil
-
-csv_import.title=Import from CSV
-csv_import.description=Import a CSV file with the configurations from the TIA portal
-
-excel_import.title= Import from Excel file
-excel_import.description=Import a Excel file with the configurations from the TIA portal
-
-plc_nodes_csv_file.title=CSV File
-plc_nodes_csv_file.description=Contains three columns 'Name', 'Data Type', 'Logical Address'
-
-plc_nodes_excel_file.title=Excel File
-plc_nodes_excel_file.description=Contains three columns 'Name', 'Data Type', 'Logical Address'
-
-plc_node_address.title=Node Address
-plc_node_address.description= Address/field in the corresponding register
-
-plc_node_id.title=Node ID
-plc_node_id.description= ID of the specific device
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/documentation.md
deleted file mode 100644
index c3da505..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## ISS Adapter
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Shows the live position of the International Space Station (ISS), updated every two seconds.
-
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/icon.png
deleted file mode 100644
index cfb6339..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/strings.en
deleted file mode 100644
index 67384f5..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.plc4x.s7/strings.en
+++ /dev/null
@@ -1,26 +0,0 @@
-org.apache.streampipes.connect.adapters.plc4x.s7.title=PLC4X S7
-org.apache.streampipes.connect.adapters.plc4x.s7.description=Connect directly to your PLC
-
-plc_ip.title=PLC Address
-plc_ip.description=Example: 192.168.34.56
-
-plc_polling_interval.title=Polling Interval [ms]
-plc_polling_interval.description=Polling Interval of adapter in milliseconds. Minimum value is 10.
-
-configure.title=Configuration
-configure.description=
-
-manually.title=Enter Manually
-manually.description=Enter the addresses to read the data from manually
-
-plc_nodes.title=Nodes
-plc_nodes.description=Define the nodes of the PLC
-
-plc_node_runtime_name.title=Runtime Name
-plc_node_runtime_name.description=example: temperature
-
-plc_node_name.title=Node Name
-plc_node_name.description=example: %Q0.4
-
-plc_node_type.title=Data Type
-plc_node_type.description=example: bool
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md
deleted file mode 100644
index 3c42165..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md
+++ /dev/null
@@ -1,58 +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.
- ~
- -->
-
-## Ros Bridge
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Connect Robots running on ROS
-
-
-***
-
-## Required input
-
-
-
-***
-
-## Configuration
-
-Describe the configuration parameters here
-
-### Ros Bridge
-
-Example: test-server.com (No protocol)
-
-### Port
-
-The port of the ROS instance.
-
-### Topic
-
-Example: /battery (Starts with /)
-
-
-## Output
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png
deleted file mode 100644
index ae0e943..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
deleted file mode 100644
index 3dbb467..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
+++ /dev/null
@@ -1,11 +0,0 @@
-org.apache.streampipes.connect.adapters.ros.title=ROS Bridge
-org.apache.streampipes.connect.adapters.ros.description=Connect Robots running on ROS.
-
-ROS_HOST_KEY.title=Ros Bridge
-ROS_HOST_KEY.description=Example: test-server.com (No protocol)
-
-ROS_PORT_KEY.title=Port
-ROS_PORT_KEY.description=Example: 9090
-
-TOPIC_KEY.title=Topic
-TOPIC_KEY.description=Example: /battery (Starts with /)
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/documentation.md
deleted file mode 100644
index ec3ed05..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/documentation.md
+++ /dev/null
@@ -1,34 +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.
- ~
- -->
-
-## Machine Data Simulator
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Publishes various simulated machine sensor data in a configurable time interval (in milliseconds).
-Sensors are:
-* flowrate
-* pressure
-* waterlevel
-***
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/icon.png
deleted file mode 100644
index 33c09c4..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/strings.en
deleted file mode 100644
index a9e8b06..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.machine/strings.en
+++ /dev/null
@@ -1,8 +0,0 @@
-org.apache.streampipes.connect.adapters.simulator.machine.title=Machine Data Simulator
-org.apache.streampipes.connect.adapters.simulator.machine.description=Publishes various simulated machine sensor data
-
-wait-time-ms.title=Wait Time (MS)
-wait-time-ms.description=The time to wait between two events in milliseconds
-
-selected-simulator-option.title=Select sensor
-selected-simulator-option.description=Select simulated sensor data to be published
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/documentation.md
deleted file mode 100644
index a03969e..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## File (Stream)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Continuously streams the content from a file
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/icon.png
deleted file mode 100644
index 2b3a037..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/strings.en
deleted file mode 100644
index 9146e11..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.file/strings.en
+++ /dev/null
@@ -1,12 +0,0 @@
-org.apache.streampipes.connect.protocol.stream.file.title=File Stream
-org.apache.streampipes.connect.protocol.stream.file=Continuously streams the content from a file.
-
-filePath.title=File
-filePath.description=File Path
-
-replaceTimestamp.title=Use current time
-replaceTimestamp.description=Replace Event Time with Current Timestamp
-
-speed.title=Replay Speed
-speed.description=original = 1; speedup 2x = 2; half speed = 0.5
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/documentation.md
deleted file mode 100644
index aeb5205..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## HTTP (Stream)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Continuously fetched events from an HTTP REST endpoint.
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/icon.png
deleted file mode 100644
index b44424d..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/strings.en
deleted file mode 100644
index a597048..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.http/strings.en
+++ /dev/null
@@ -1,10 +0,0 @@
-org.apache.streampipes.connect.protocol.stream.http.title=HTTP Stream
-org.apache.streampipes.connect.protocol.stream.http.description=Continuously fetched events from an HTTP REST endpoint.
-
-url.title=URL
-url.description=Example: http(s)://test-server.com
-
-interval.title=Interval [sec]
-interval.description=Example: 5 (Polling interval in seconds)
-
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/documentation.md
deleted file mode 100644
index 7b261ed..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## Apache Kafka
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Consumes messages from an Apache Kafka broker
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/icon.png
deleted file mode 100644
index 8b72662..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/strings.en
deleted file mode 100644
index d0c6ca7..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.kafka/strings.en
+++ /dev/null
@@ -1,29 +0,0 @@
-org.apache.streampipes.connect.protocol.stream.kafka.title=Apache Kafka
-org.apache.streampipes.connect.protocol.stream.kafka.description=Consumes messages from an Apache Kafka broker
-
-host.title=Broker Hostname
-host.description=Example: test.server.com (No protocol)
-
-port.title=Broker Port
-port.description=9092
-
-topic.title=Topic
-topic.description=Example: test.topic
-
-access-mode.title=Access Mode
-access-mode.description=
-
-anonymous-alternative.title=Unauthenticated
-anonymous-alternative.description=
-
-username-alternative.title=Username/Password
-username-alternative.description=
-
-username-group.title=User Group
-username-group.description=
-
-username.title=Username
-username.description=
-
-password.title=Password
-password.description=
\ No newline at end of file
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md
deleted file mode 100644
index 3a9e819..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md
+++ /dev/null
@@ -1,47 +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.
- ~
- -->
-
-## MQTT
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Consumes messages from a broker using the MQTT protocol
-
-
-***
-
-## Configuration
-
-Describe the configuration parameters here
-
-### Broker Url
-
-Example: tcp://test-server.com:1883 (Protocol required. Port required)"
-
-### Access Mode
-
-Unauthenticated or Authenticated (Username/Password)
-
-## Output
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png
deleted file mode 100644
index 88f2035..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en
deleted file mode 100644
index 5e9cc4d..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en
+++ /dev/null
@@ -1,27 +0,0 @@
-org.apache.streampipes.connect.protocol.stream.mqtt.title=MQTT
-org.apache.streampipes.connect.protocol.stream.mqttdescription=Consumes messages from a broker using the MQTT protocol
-
-access-mode.title=Access Mode
-access-mode.description=
-
-anonymous-alternative.title=Unauthenticated
-anonymous-alternative.description=
-
-username-alternative.title=Username/Password
-username-alternative.description=
-
-username-group.title=User Group
-username-group.description=
-
-username.title=Username
-username.description=
-
-password.title=Password
-password.description=
-
-broker_url.title=Broker URL
-broker_url.description=Example: tcp://test-server.com:1883 (Protocol required. Port required)"
-
-topic.title=Topic
-topic.description=Example: test/topic
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/documentation.md
deleted file mode 100644
index 0493b65..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## Apache Pulsar
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Consumes messages from an Apache Pulsar broker
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/icon.png
deleted file mode 100644
index d1b1228..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/strings.en
deleted file mode 100644
index 9e37e8d..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.pulsar/strings.en
+++ /dev/null
@@ -1,13 +0,0 @@
-org.apache.streampipes.connect.protocol.stream.pulsar.title=Apache Pulsar
-org.apache.streampipes.connect.protocol.stream.pulsar.description=Consumes messages from an Apache Pulsar broker
-
-pulsar-broker-host.title=Broker Hostname
-pulsar-broker-host.description=Example: test.server.com (No protocol)
-
-pulsar-broker-port.title=Broker Port
-pulsar-broker-port.description=Example: 6650
-
-pulsar-topic.title=Topic
-pulsar-topic.description=Example: test.topic
-
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/documentation.md
deleted file mode 100644
index 4fb4f06..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## File (Set)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Reads the content from a local file.
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/icon.png
deleted file mode 100644
index 2b3a037..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/strings.en
deleted file mode 100644
index c80655b..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.file/strings.en
+++ /dev/null
@@ -1,10 +0,0 @@
-org.apache.streampipes.protocol.set.file.title=File Set
-org.apache.streampipes.protocol.set.file.description=Reads the content from a local file.
-
-interval-key.title=Interval [ms]
-interval-key.description=Define waiting time between the files
-
-filePath.title=File
-filePath.description=File Path
-
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/documentation.md
deleted file mode 100644
index 2ea9640..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## HTTP (Set)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Regularly poll an HTTP endpoint
-
-***
-
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/icon.png
deleted file mode 100644
index b44424d..0000000
Binary files a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/icon.png and /dev/null differ
diff --git a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/strings.en
deleted file mode 100644
index 678f412..0000000
--- a/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.protocol.set.http/strings.en
+++ /dev/null
@@ -1,7 +0,0 @@
-org.apache.streampipes.protocol.set.http.title=HTTP Set
-org.apache.streampipes.protocol.set.http.description=Regularly poll an HTTP endpoint
-
-url.title=URL
-url.description=Example: http(s)://test-server.com
-
-
[incubator-streampipes-extensions] 01/02: [STREAMPIPES-387] Split
StreamPipes Connect worker into two different services
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 27a37731207bb998e71bb69b7204a8b487250f7b
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Oct 12 10:06:03 2021 +0200
[STREAMPIPES-387] Split StreamPipes Connect worker into two different services
---
.github/workflows/build.yml | 30 ++++++++++++++++++----
.../connect/iiot/ConnectAdapterIiotInit.java | 26 ++++++++++++++++---
.../connect/iiot/adapters/netio/NetioUtils.java | 1 -
.../adapters/plc4x/modbus/Plc4xModbusAdapter.java | 1 -
.../plc4x/passive/Plc4xPassiveAdapter.java | 1 -
.../iiot/adapters/plc4x/s7/Plc4xS7Adapter.java | 1 -
.../iiot/adapters/ros/RosBridgeAdapter.java | 1 -
.../connect/iiot/protocol/set/FileProtocol.java | 2 +-
.../connect/iiot/protocol/set/HttpProtocol.java | 2 +-
.../iiot/protocol/stream/BrokerProtocol.java | 2 +-
.../iiot/protocol/stream/FileStreamProtocol.java | 2 +-
.../iiot/protocol/stream/HttpStreamProtocol.java | 2 +-
.../streampipes/connect/ConnectAdapterInit.java | 9 +++----
13 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89ed563..6dc4161 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,13 +65,33 @@ jobs:
run: |
echo '{"experimental": true}' | sudo tee /etc/docker/daemon.json
sudo service docker restart
- - name: Build and Push Docker Image connect-worker-main
+ - name: Build and Push Docker Image connect-adapters
working-directory: ./streampipes-connect-adapters
env:
- IMG_NAME_DEFAULT: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-worker:${{ env.MVN_VERSION }}
- IMG_NAME_AMD64: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-worker:amd64-${{ env.MVN_VERSION }}
- IMG_NAME_ARM32V7: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-worker:arm32v7-${{ env.MVN_VERSION }}
- IMG_NAME_ARM64V8: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-worker:arm64v8-${{ env.MVN_VERSION }}
+ IMG_NAME_DEFAULT: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters:${{ env.MVN_VERSION }}
+ IMG_NAME_AMD64: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters:amd64-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM32V7: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters:arm32v7-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM64V8: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters:arm64v8-${{ env.MVN_VERSION }}
+ run: |
+ cp /usr/bin/{qemu-arm-static,qemu-aarch64-static} .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_DEFAULT -t $IMG_NAME_DEFAULT -t $IMG_NAME_AMD64 -f Dockerfile .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_ARM32V7 -t $IMG_NAME_ARM32V7 -f arm.Dockerfile .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_ARM64V8 -t $IMG_NAME_ARM64V8 -f aarch64.Dockerfile .
+ docker push $IMG_NAME_DEFAULT
+ docker push $IMG_NAME_AMD64
+ docker push $IMG_NAME_ARM32V7
+ docker push $IMG_NAME_ARM64V8
+ docker manifest create $IMG_NAME_DEFAULT $IMG_NAME_AMD64 $IMG_NAME_ARM32V7 $IMG_NAME_ARM64V8
+ docker manifest annotate $IMG_NAME_DEFAULT $IMG_NAME_ARM32V7 --os linux --arch arm
+ docker manifest annotate $IMG_NAME_DEFAULT $IMG_NAME_ARM64V8 --os linux --arch arm64
+ docker manifest push $IMG_NAME_DEFAULT
+ - name: Build and Push Docker Image connect-adapters-iiot
+ working-directory: ./streampipes-connect-adapters-iiot
+ env:
+ IMG_NAME_DEFAULT: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters-iiot:${{ env.MVN_VERSION }}
+ IMG_NAME_AMD64: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters-iiot:amd64-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM32V7: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters-iiot:arm32v7-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM64V8: ${{ env.DOCKERHUB_APACHE_REPO }}/connect-adapters-iiot:arm64v8-${{ env.MVN_VERSION }}
run: |
cp /usr/bin/{qemu-arm-static,qemu-aarch64-static} .
docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_DEFAULT -t $IMG_NAME_DEFAULT -t $IMG_NAME_AMD64 -f Dockerfile .
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
index effbed6..074a895 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/ConnectAdapterIiotInit.java
@@ -1,3 +1,21 @@
+/*
+ * 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.streampipes.connect.iiot;
import org.apache.streampipes.connect.iiot.adapters.influxdb.InfluxDbSetAdapter;
@@ -19,7 +37,7 @@ import org.apache.streampipes.connect.iiot.protocol.stream.pulsar.PulsarProtocol
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
-public class ConnectAdapterIiotInit extends ExtensionsModelSubmitter{
+public class ConnectAdapterIiotInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new ConnectAdapterIiotInit().init();
}
@@ -28,7 +46,7 @@ public class ConnectAdapterIiotInit extends ExtensionsModelSubmitter{
public SpServiceDefinition provideServiceDefinition() {
return SpServiceDefinitionBuilder.create("connect-worker-main",
"StreamPipes Connect Worker Main",
- "",8000)
+ "",8001)
.registerAdapter(new MySqlStreamAdapter())
.registerAdapter(new MySqlSetAdapter())
.registerAdapter(new MachineDataStreamAdapter())
@@ -36,8 +54,8 @@ public class ConnectAdapterIiotInit extends ExtensionsModelSubmitter{
.registerAdapter(new OpcUaAdapter())
.registerAdapter(new InfluxDbStreamAdapter())
.registerAdapter(new InfluxDbSetAdapter())
- .registerAdapter(new NetioRestAdapter())
- .registerAdapter(new NetioMQTTAdapter())
+ .registerAdapter(new NetioRestAdapter())
+ .registerAdapter(new NetioMQTTAdapter())
.registerAdapter(new Plc4xS7Adapter())
.registerAdapter(new Plc4xModbusAdapter())
.registerAdapter(new FileProtocol())
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/netio/NetioUtils.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/netio/NetioUtils.java
index 8e46a1a..b7da893 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/netio/NetioUtils.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/netio/NetioUtils.java
@@ -155,7 +155,6 @@ public class NetioUtils {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java
index bbfe932..3b0a4a6 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java
@@ -215,7 +215,6 @@ public class Plc4xModbusAdapter extends PullAdapter{
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/passive/Plc4xPassiveAdapter.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/passive/Plc4xPassiveAdapter.java
index 433c4c1..d4e916f 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/passive/Plc4xPassiveAdapter.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/passive/Plc4xPassiveAdapter.java
@@ -91,7 +91,6 @@ public class Plc4xPassiveAdapter extends SpecificDataStreamAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java
index 2cab7cf..19224d1 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -157,7 +157,6 @@ public class Plc4xS7Adapter extends PullAdapter {
eventSchema.setEventProperties(allProperties);
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
index 0b88b6b..161b8f4 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
@@ -202,7 +202,6 @@ public class RosBridgeAdapter extends SpecificDataStreamAdapter implements Resol
GuessSchema guessSchema = new GuessSchema();
guessSchema.setEventSchema(eventSchema);
- guessSchema.setPropertyProbabilityList(new ArrayList<>());
return guessSchema;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/FileProtocol.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/FileProtocol.java
index 8d3f88a..3073a4a 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/FileProtocol.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/FileProtocol.java
@@ -125,7 +125,7 @@ public class FileProtocol extends Protocol {
EventSchema eventSchema = parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(20));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
} catch (FileNotFoundException e) {
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/HttpProtocol.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/HttpProtocol.java
index 33e5709..1feb4cc 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/HttpProtocol.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/set/HttpProtocol.java
@@ -116,7 +116,7 @@ public class HttpProtocol extends Protocol {
EventSchema eventSchema= parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(2));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/BrokerProtocol.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/BrokerProtocol.java
index 7dbe555..835fffc 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/BrokerProtocol.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/BrokerProtocol.java
@@ -50,7 +50,7 @@ public abstract class BrokerProtocol extends Protocol {
List<byte[]> eventByte = getNByteElements(1);
EventSchema eventSchema = parser.getEventSchema(eventByte);
- return SchemaGuesser.guessSchma(eventSchema, getNElements(1));
+ return SchemaGuesser.guessSchma(eventSchema);
}
@Override
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileStreamProtocol.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileStreamProtocol.java
index edda453..6536c3d 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileStreamProtocol.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileStreamProtocol.java
@@ -211,7 +211,7 @@ public class FileStreamProtocol extends Protocol {
EventSchema eventSchema = parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(2));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}
diff --git a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
index 24b403a..39a5dad 100644
--- a/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
+++ b/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
@@ -112,7 +112,7 @@ public class HttpStreamProtocol extends PullProtocol {
dataByte.addAll(dataByte);
}
EventSchema eventSchema= parser.getEventSchema(dataByte);
- GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(n));
+ GuessSchema result = SchemaGuesser.guessSchma(eventSchema);
return result;
}
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index 2f147a3..aa18243 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -18,11 +18,11 @@
package org.apache.streampipes.connect;
+import org.apache.streampipes.connect.adapters.coindesk.CoindeskBitcoinAdapter;
import org.apache.streampipes.connect.adapters.flic.FlicMQTTAdapter;
import org.apache.streampipes.connect.adapters.gdelt.GdeltAdapter;
-import org.apache.streampipes.connect.adapters.coindesk.CoindeskBitcoinAdapter;
-import org.apache.streampipes.connect.adapters.iex.IexCloudStockAdapter;
import org.apache.streampipes.connect.adapters.iex.IexCloudNewsAdapter;
+import org.apache.streampipes.connect.adapters.iex.IexCloudStockAdapter;
import org.apache.streampipes.connect.adapters.image.set.ImageSetAdapter;
import org.apache.streampipes.connect.adapters.image.stream.ImageStreamAdapter;
import org.apache.streampipes.connect.adapters.iss.IssAdapter;
@@ -31,7 +31,6 @@ import org.apache.streampipes.connect.adapters.simulator.random.RandomDataStream
import org.apache.streampipes.connect.adapters.slack.SlackAdapter;
import org.apache.streampipes.connect.adapters.wikipedia.WikipediaEditedArticlesAdapter;
import org.apache.streampipes.connect.adapters.wikipedia.WikipediaNewArticlesAdapter;
-import org.apache.streampipes.connect.protocol.stream.*;
import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
import org.apache.streampipes.container.model.SpServiceDefinition;
import org.apache.streampipes.container.model.SpServiceDefinitionBuilder;
@@ -46,7 +45,7 @@ public class ConnectAdapterInit extends ExtensionsModelSubmitter {
public SpServiceDefinition provideServiceDefinition() {
return SpServiceDefinitionBuilder.create("connect-worker-main",
"StreamPipes Connect Worker Main",
- "",8000)
+ "",8002)
.registerAdapter(new GdeltAdapter())
.registerAdapter(new CoindeskBitcoinAdapter())
.registerAdapter(new IexCloudNewsAdapter())
@@ -60,7 +59,7 @@ public class ConnectAdapterInit extends ExtensionsModelSubmitter {
.registerAdapter(new ImageSetAdapter())
.registerAdapter(new IssAdapter())
.registerAdapter(new FlicMQTTAdapter())
- .registerAdapter(new HDFSProtocol())
+// .registerAdapter(new HDFSProtocol())
.build();
}