You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/12/22 09:03:13 UTC
[incubator-streampipes-extensions] 06/14: latest changes
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 24fb87533e2fa789a621b53b56046998450ac13d
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Nov 24 10:35:52 2020 +0100
latest changes
---
.github/workflows/build.yml | 16 +++++-----
.idea/runConfigurations/all_pe_jvm__edge_01_.xml | 35 ++++++++++++++++++++++
.idea/runConfigurations/all_pe_jvm__edge_02_.xml | 35 ++++++++++++++++++++++
.idea/runConfigurations/all_pe_jvm__fog_.xml | 35 ++++++++++++++++++++++
.idea/runConfigurations/node_controller_cloud.xml | 32 ++++++++++++++++++++
.../runConfigurations/node_controller_edge_01.xml | 34 +++++++++++++++++++++
.../runConfigurations/node_controller_edge_02.xml | 33 ++++++++++++++++++++
.idea/runConfigurations/node_controller_fog.xml | 32 ++++++++++++++++++++
pom.xml | 5 ++++
.../protocol/stream/FileStreamProtocol.java | 32 ++++++++++++++++----
.../pe/flink/AllFlinkPipelineElementsInit.java | 8 +++--
.../pe/jvm/AllPipelineElementsInit.java | 13 ++++----
.../aggregation/flink/AggregationFlinkInit.java | 8 +++--
.../enricher/flink/EnricherFlinkInit.java | 8 +++--
streampipes-processors-enricher-jvm/pom.xml | 4 +++
.../processors/enricher/jvm/EnricherJvmInit.java | 8 ++---
streampipes-processors-filters-jvm/pom.xml | 4 +++
.../processors/filters/jvm/FiltersJvmInit.java | 11 ++++---
streampipes-processors-filters-siddhi/pom.xml | 4 +++
.../processors/siddhi/FiltersSiddhiInit.java | 11 ++++---
.../processor/geo/flink/GeoFlinkInit.java | 9 ++++--
streampipes-processors-geo-jvm/pom.xml | 5 +++-
.../streampipes/processors/geo/jvm/GeoJvmInit.java | 12 ++++----
.../latLngToGeo/LatLngToGeoController.java | 3 --
.../jts/processor/setEPSG/SetEpsgController.java | 2 --
.../CreateTrajectoryFromPointsController.java | 3 --
.../pom.xml | 6 ++++
.../jvm/ImageProcessingJvmInit.java | 11 ++++---
.../detection/flink/PatternDetectionFlinkInit.java | 6 ++--
.../statistics/flink/StatisticsFlinkInit.java | 9 ++++--
.../textmining/flink/TextMiningFlinkInit.java | 12 ++++++--
streampipes-processors-text-mining-jvm/pom.xml | 6 ++++
.../textmining/jvm/TextMiningJvmInit.java | 11 ++++---
.../flink/TransformationFlinkInit.java | 9 ++++--
streampipes-processors-transformation-jvm/pom.xml | 4 +++
.../transformation/jvm/TransformationJvmInit.java | 11 ++++---
.../stringoperator/timer/StringTimer.java | 9 +++++-
.../timer/StringTimerController.java | 13 +++++++-
.../timer/StringTimerParameters.java | 7 ++++-
.../TransformToBooleanController.java | 2 --
.../duration/CalculateDurationController.java | 4 ---
.../documentation.md | 5 +++-
.../strings.en | 3 +-
streampipes-sinks-brokers-jvm/pom.xml | 4 +++
.../sinks/brokers/jvm/BrokersJvmInit.java | 11 ++++---
.../jvm/bufferrest/BufferRestController.java | 2 --
.../sinks/databases/flink/DatabasesFlinkInit.java | 9 ++++--
streampipes-sinks-databases-jvm/pom.xml | 5 +++-
.../sinks/databases/jvm/DatabasesJvmInit.java | 11 ++++---
.../sinks/databases/jvm/opcua/UpcUaController.java | 2 --
streampipes-sinks-internal-jvm/pom.xml | 4 +++
.../sinks/internal/jvm/SinksInternalJvmInit.java | 11 ++++---
.../jvm/config/SinksInternalJvmConfig.java | 4 ---
.../sinks/internal/jvm/dashboard/Dashboard.java | 5 +++-
.../jvm/notification/NotificationProducer.java | 4 ++-
streampipes-sinks-notifications-jvm/pom.xml | 4 +++
.../jvm/SinksNotificationsJvmInit.java | 11 ++++---
57 files changed, 499 insertions(+), 118 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f795c19..ba2d547 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
steps:
- name: Set Branch env variable
run: |
- echo "::set-env name=GITHUB_BRANCH::${GITHUB_REF#refs/*/}"
+ echo "GITHUB_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
echo ${{ env.GITHUB_BRANCH }}
- name: Checkout incubator-streampipes project
uses: actions/checkout@v2
@@ -45,15 +45,15 @@ jobs:
uses: actions/checkout@v1
- name: Build Extensions with Maven
working-directory: ./
- run: mvn clean package javadoc:aggregate -U
+ run: mvn clean package javadoc:aggregate
- name: Set env variables for Docker builds
run: |
- echo "::set-env name=DOCKER_CLI_EXPERIMENTAL::enabled"
- echo "::set-env name=MVN_VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
- echo "::set-env name=DOCKERHUB_APACHE_REPO::apachestreampipes"
- echo "::set-env name=BASE_IMG_JRE_DEFAULT::adoptopenjdk/openjdk8-openj9:alpine"
- echo "::set-env name=BASE_IMG_JRE_ARM32V7::arm32v7/openjdk:11-jre-slim"
- echo "::set-env name=BASE_IMG_JRE_ARM64V8::arm64v8/openjdk:11-jre-slim"
+ echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
+ echo "MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+ echo "DOCKERHUB_APACHE_REPO=apachestreampipes" >> $GITHUB_ENV
+ echo "BASE_IMG_JRE_DEFAULT=adoptopenjdk/openjdk8-openj9:alpine" >> $GITHUB_ENV
+ echo "BASE_IMG_JRE_ARM32V7=arm32v7/openjdk:11-jre-slim" >> $GITHUB_ENV
+ echo "BASE_IMG_JRE_ARM64V8=arm64v8/openjdk:11-jre-slim" >> $GITHUB_ENV
- name: Install qemu-user-static for multi-arch builds
run: |
sudo apt-get update
diff --git a/.idea/runConfigurations/all_pe_jvm__edge_01_.xml b/.idea/runConfigurations/all_pe_jvm__edge_01_.xml
new file mode 100644
index 0000000..ae3a99a
--- /dev/null
+++ b/.idea/runConfigurations/all_pe_jvm__edge_01_.xml
@@ -0,0 +1,35 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="all-pe-jvm (edge-01)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_PORT" value="7024" />
+ <env name="SP_HOST" value="edge-01.fzi.de" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_COUCHDB_HOST" value="localhost" />
+ <env name="SP_JMS_HOST" value="localhost" />
+ <env name="SP_JMS_PORT" value="61616" />
+ <env name="SP_DATA_LAKE_HOST" value="localhost" />
+ <env name="SP_DATA_LAKE_PORT" value="8086" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_BACKEND_PORT" value="8030" />
+ <env name="SP_NODE_ID" value="edge-01.node-controller" />
+ <env name="SP_NODE_CONTROLLER_HOST" value="edge-01.fzi.de" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7077" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
+ <module name="streampipes-pipeline-elements-all-jvm" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="streampipes-pipeline-elements-all-jvm/development/env.secondary" />
+ </ENTRIES>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/all_pe_jvm__edge_02_.xml b/.idea/runConfigurations/all_pe_jvm__edge_02_.xml
new file mode 100644
index 0000000..15893a6
--- /dev/null
+++ b/.idea/runConfigurations/all_pe_jvm__edge_02_.xml
@@ -0,0 +1,35 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="all-pe-jvm (edge-02)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_PORT" value="7025" />
+ <env name="SP_HOST" value="edge-02.fzi.de" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_COUCHDB_HOST" value="localhost" />
+ <env name="SP_JMS_HOST" value="localhost" />
+ <env name="SP_JMS_PORT" value="61616" />
+ <env name="SP_DATA_LAKE_HOST" value="localhost" />
+ <env name="SP_DATA_LAKE_PORT" value="8086" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_BACKEND_PORT" value="8030" />
+ <env name="SP_NODE_ID" value="edge-02.node-controller" />
+ <env name="SP_NODE_CONTROLLER_HOST" value="edge-02.fzi.de" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7078" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
+ <module name="streampipes-pipeline-elements-all-jvm" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="streampipes-pipeline-elements-all-jvm/development/env.secondary" />
+ </ENTRIES>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/all_pe_jvm__fog_.xml b/.idea/runConfigurations/all_pe_jvm__fog_.xml
new file mode 100644
index 0000000..0ece8ec
--- /dev/null
+++ b/.idea/runConfigurations/all_pe_jvm__fog_.xml
@@ -0,0 +1,35 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="all-pe-jvm (fog)" type="Application" factoryName="Application" folderName="edge-extensions">
+ <envs>
+ <env name="SP_PORT" value="7026" />
+ <env name="SP_HOST" value="fog.fzi.de" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_COUCHDB_HOST" value="localhost" />
+ <env name="SP_JMS_HOST" value="localhost" />
+ <env name="SP_JMS_PORT" value="61616" />
+ <env name="SP_DATA_LAKE_HOST" value="localhost" />
+ <env name="SP_DATA_LAKE_PORT" value="8086" />
+ <env name="SP_BACKEND_HOST" value="localhost" />
+ <env name="SP_BACKEND_PORT" value="8030" />
+ <env name="SP_NODE_ID" value="fog.node-controller" />
+ <env name="SP_NODE_CONTROLLER_HOST" value="fog.fzi.de" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7079" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.jvm.AllPipelineElementsInit" />
+ <module name="streampipes-pipeline-elements-all-jvm" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="streampipes-pipeline-elements-all-jvm/development/env.secondary" />
+ </ENTRIES>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_cloud.xml b/.idea/runConfigurations/node_controller_cloud.xml
new file mode 100644
index 0000000..6cfc672
--- /dev/null
+++ b/.idea/runConfigurations/node_controller_cloud.xml
@@ -0,0 +1,32 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="node-controller-cloud" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
+ <module name="streampipes-node-controller-container" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
+ </ENTRIES>
+ </extension>
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <envs>
+ <env name="SP_BACKEND_HOST" value="host.docker.internal" />
+ <env name="CONSUL_LOCATION" value="host.docker.internal" />
+ <env name="SP_NODE_CONTROLLER_ID" value="cloud.node-controller" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7080" />
+ <env name="SP_NODE_HOST" value="cloud.fzi.de" />
+ <env name="SP_NODE_TYPE" value="cloud" />
+ <env name="SP_NODE_HAS_GPU" value="true" />
+ <env name="SP_NODE_LOCATION_CLOUD" value="bwcloud" />
+ <env name="SP_DEBUG" value="true" />
+ </envs>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_edge_01.xml b/.idea/runConfigurations/node_controller_edge_01.xml
new file mode 100644
index 0000000..450f314
--- /dev/null
+++ b/.idea/runConfigurations/node_controller_edge_01.xml
@@ -0,0 +1,34 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="node-controller-edge-01" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
+ <module name="streampipes-node-controller-container" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
+ </ENTRIES>
+ </extension>
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <envs>
+ <env name="SP_BACKEND_HOST" value="host.docker.internal" />
+ <env name="CONSUL_LOCATION" value="host.docker.internal" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-01.node-controller" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7077" />
+ <env name="SP_NODE_HOST" value="edge-01.fzi.de" />
+ <env name="SP_NODE_TYPE" value="edge" />
+ <env name="SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ROS" value="ros;universalrobot;ipe-k3s-pi1.fzi.de;network" />
+ <env name="SP_NODE_HAS_GPU" value="false" />
+ <env name="SP_NODE_LOCATION_BUILDING" value="holl" />
+ <env name="SP_NODE_LOCATION_MACHINE" value="UR" />
+ <env name="SP_DEBUG" value="true" />
+ </envs>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_edge_02.xml b/.idea/runConfigurations/node_controller_edge_02.xml
new file mode 100644
index 0000000..c97ce50
--- /dev/null
+++ b/.idea/runConfigurations/node_controller_edge_02.xml
@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="node-controller-edge-02" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
+ <module name="streampipes-node-controller-container" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
+ </ENTRIES>
+ </extension>
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <envs>
+ <env name="SP_BACKEND_HOST" value="host.docker.internal" />
+ <env name="CONSUL_LOCATION" value="host.docker.internal" />
+ <env name="SP_NODE_CONTROLLER_ID" value="edge-02.node-controller" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7078" />
+ <env name="SP_NODE_HOST" value="edge-02.fzi.de" />
+ <env name="SP_NODE_TYPE" value="edge" />
+ <env name="SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ZED" value="zed;sensor;/dev/video1;usb" />
+ <env name="SP_NODE_HAS_GPU" value="true" />
+ <env name="SP_NODE_LOCATION_BUILDING" value="holl" />
+ <env name="SP_DEBUG" value="true" />
+ </envs>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_fog.xml b/.idea/runConfigurations/node_controller_fog.xml
new file mode 100644
index 0000000..041e321
--- /dev/null
+++ b/.idea/runConfigurations/node_controller_fog.xml
@@ -0,0 +1,32 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="node-controller-fog" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions">
+ <module name="streampipes-node-controller-container" />
+ <extension name="net.ashald.envfile">
+ <option name="IS_ENABLED" value="true" />
+ <option name="IS_SUBST" value="false" />
+ <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+ <option name="IS_IGNORE_MISSING_FILES" value="false" />
+ <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+ <ENTRIES>
+ <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+ <ENTRY IS_ENABLED="true" PARSER="env" PATH="$PROJECT_DIR$/../incubator-streampipes/streampipes-node-controller-container/development/env" />
+ </ENTRIES>
+ </extension>
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerContainerInit" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <envs>
+ <env name="SP_BACKEND_HOST" value="host.docker.internal" />
+ <env name="CONSUL_LOCATION" value="host.docker.internal" />
+ <env name="SP_NODE_CONTROLLER_ID" value="fog.node-controller" />
+ <env name="SP_NODE_CONTROLLER_PORT" value="7079" />
+ <env name="SP_NODE_HOST" value="fog.fzi.de" />
+ <env name="SP_NODE_TYPE" value="fog" />
+ <env name="SP_NODE_HAS_GPU" value="true" />
+ <env name="SP_NODE_LOCATION_BUILDING" value="main" />
+ <env name="SP_DEBUG" value="true" />
+ </envs>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d2f18ff..7fa71e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,6 +386,11 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ <version>${streampipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
<version>${streampipes.version}</version>
</dependency>
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
index bfbdb56..cc00361 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
@@ -26,11 +26,11 @@ import org.apache.streampipes.connect.adapter.model.generic.Format;
import org.apache.streampipes.connect.adapter.model.generic.Parser;
import org.apache.streampipes.connect.adapter.model.generic.Protocol;
import org.apache.streampipes.connect.adapter.model.pipeline.AdapterPipeline;
-import org.apache.streampipes.connect.adapter.preprocessing.elements.SendToKafkaAdapterSink;
-import org.apache.streampipes.connect.adapter.preprocessing.elements.SendToKafkaReplayAdapterSink;
+import org.apache.streampipes.connect.adapter.preprocessing.elements.*;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
+import org.apache.streampipes.model.grounding.MqttTransportProtocol;
import org.apache.streampipes.model.schema.*;
import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
import org.apache.streampipes.sdk.extractor.StaticPropertyExtractor;
@@ -78,16 +78,36 @@ public class FileStreamProtocol extends Protocol {
@Override
public void run(AdapterPipeline adapterPipeline) {
String timestampKey = getTimestampKey(eventSchema.getEventProperties(), "");
- SendToKafkaAdapterSink adapterPipelineSink = (SendToKafkaAdapterSink) adapterPipeline.getPipelineSink();
- running = true;
+ // exchange adapter pipeline sink with special purpose replay sink for file replay
+ if (adapterPipeline.getPipelineSink() instanceof SendToKafkaAdapterSink) {
+ adapterPipeline.changePipelineSink(new SendToBrokerReplayAdapterSink(
+ (SendToKafkaAdapterSink) adapterPipeline.getPipelineSink(),
+ timestampKey,
+ replaceTimestamp,
+ speedUp));
+
+ } else if (adapterPipeline.getPipelineSink() instanceof SendToMqttAdapterSink) {
+ adapterPipeline.changePipelineSink(new SendToBrokerReplayAdapterSink(
+ (SendToMqttAdapterSink) adapterPipeline.getPipelineSink(),
+ timestampKey,
+ replaceTimestamp,
+ speedUp));
+
+ } else if (adapterPipeline.getPipelineSink() instanceof SendToJmsAdapterSink) {
+ adapterPipeline.changePipelineSink(new SendToBrokerReplayAdapterSink(
+ (SendToJmsAdapterSink) adapterPipeline.getPipelineSink(),
+ timestampKey,
+ replaceTimestamp,
+ speedUp));
+ }
+ running = true;
task = new Thread() {
@Override
public void run() {
while (running) {
- adapterPipeline.changePipelineSink(new SendToKafkaReplayAdapterSink(adapterPipelineSink, timestampKey,
- replaceTimestamp, speedUp));
+
format.reset();
SendToPipeline stk = new SendToPipeline(format, adapterPipeline);
InputStream dataInputStream = getDataFromEndpoint();
diff --git a/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java b/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
index 4818571..59be7c4 100644
--- a/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
+++ b/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.pe.flink.config.Config;
import org.apache.streampipes.processor.geo.flink.processor.gridenricher.SpatialGridEnrichmentController;
import org.apache.streampipes.processors.aggregation.flink.processor.aggregation.AggregationController;
@@ -90,12 +91,15 @@ public class AllFlinkPipelineElementsInit extends StandaloneModelSubmitter {
.add(new ElasticSearchController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new AllFlinkPipelineElementsInit().init(Config.INSTANCE);
diff --git a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
index bdcae89..fd39888 100644
--- a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
+++ b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.pe.jvm.config.AllPipelineElementsConfig;
import org.apache.streampipes.processors.enricher.jvm.processor.jseval.JSEvalController;
import org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureController;
@@ -193,17 +194,17 @@ public class AllPipelineElementsInit extends StandaloneModelSubmitter {
.add(new EmailController())
.add(new TelegramController())
.add(new OneSignalController())
- .add(new SlackNotificationController())
+ .add(new SlackNotificationController());
- ;
-
-
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new AllPipelineElementsInit().init(AllPipelineElementsConfig.INSTANCE);
diff --git a/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java b/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
index d63fd4d..4a41778 100644
--- a/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
+++ b/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.aggregation.flink.config.AggregationFlinkConfig;
import org.apache.streampipes.processors.aggregation.flink.processor.aggregation.AggregationController;
import org.apache.streampipes.processors.aggregation.flink.processor.count.CountController;
@@ -41,12 +42,15 @@ public class AggregationFlinkInit extends StandaloneModelSubmitter {
.add(new EventRateController())
.add(new EventCountController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new AggregationFlinkInit().init(AggregationFlinkConfig.INSTANCE);
diff --git a/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java b/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
index e331c24..093f6f4 100644
--- a/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
+++ b/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.enricher.flink.config.EnricherFlinkConfig;
import org.apache.streampipes.processors.enricher.flink.processor.math.mathop.MathOpController;
import org.apache.streampipes.processors.enricher.flink.processor.math.staticmathop.StaticMathOpController;
@@ -43,12 +44,15 @@ public class EnricherFlinkInit extends StandaloneModelSubmitter {
.add(new UrlDereferencingController())
.add(new TrigonometryController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new EnricherFlinkInit().init(EnricherFlinkConfig.INSTANCE);
diff --git a/streampipes-processors-enricher-jvm/pom.xml b/streampipes-processors-enricher-jvm/pom.xml
index d123043..fb263cc 100644
--- a/streampipes-processors-enricher-jvm/pom.xml
+++ b/streampipes-processors-enricher-jvm/pom.xml
@@ -67,6 +67,10 @@
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-messaging-kafka</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java b/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
index 31cce2f..e9ea679 100644
--- a/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
+++ b/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.enricher.jvm.config.EnricherJvmConfig;
import org.apache.streampipes.processors.enricher.jvm.processor.jseval.JSEvalController;
import org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.SizeMeasureController;
@@ -41,13 +42,12 @@ public class EnricherJvmInit extends StandaloneModelSubmitter {
new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
- new FstDataFormatFactory()
- );
+ new FstDataFormatFactory());
DeclarersSingleton.getInstance().registerProtocols(
new SpKafkaProtocolFactory(),
- new SpJmsProtocolFactory()
- );
+ new SpMqttProtocolFactory(),
+ new SpJmsProtocolFactory());
new EnricherJvmInit().init(EnricherJvmConfig.INSTANCE);
}
diff --git a/streampipes-processors-filters-jvm/pom.xml b/streampipes-processors-filters-jvm/pom.xml
index c67ba47..5c9c721 100644
--- a/streampipes-processors-filters-jvm/pom.xml
+++ b/streampipes-processors-filters-jvm/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
diff --git a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
index 3d7a25b..bd6cfdc 100644
--- a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
+++ b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.filters.jvm.config.FiltersJvmConfig;
import org.apache.streampipes.processors.filters.jvm.processor.compose.ComposeController;
import org.apache.streampipes.processors.filters.jvm.processor.enrich.MergeByEnrichController;
@@ -40,8 +41,7 @@ import org.apache.streampipes.processors.filters.jvm.processor.threshold.Thresho
public class FiltersJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new NumericalFilterController())
.add(new ThresholdDetectionController())
.add(new TextFilterController())
@@ -52,12 +52,15 @@ public class FiltersJvmInit extends StandaloneModelSubmitter {
.add(new NumericalTextFilterController())
.add(new RateLimitController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new FiltersJvmInit().init(FiltersJvmConfig.INSTANCE);
diff --git a/streampipes-processors-filters-siddhi/pom.xml b/streampipes-processors-filters-siddhi/pom.xml
index e0ff121..f64c515 100644
--- a/streampipes-processors-filters-siddhi/pom.xml
+++ b/streampipes-processors-filters-siddhi/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
diff --git a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
index a6423cf..565f415 100644
--- a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
+++ b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.siddhi.config.FilterSiddhiConfig;
import org.apache.streampipes.processors.siddhi.filter.NumericalFilterController;
import org.apache.streampipes.processors.siddhi.listcollector.ListCollector;
@@ -35,8 +36,7 @@ import org.apache.streampipes.processors.siddhi.trend.TrendController;
public class FiltersSiddhiInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new TrendController())
.add(new NumericalFilterController())
.add(new ListFilter())
@@ -47,12 +47,15 @@ public class FiltersSiddhiInit extends StandaloneModelSubmitter {
// .add(new FrequencyChangeController())
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new FiltersSiddhiInit().init(FilterSiddhiConfig.INSTANCE);
diff --git a/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java b/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
index 2c94891..f531145 100644
--- a/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
+++ b/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processor.geo.flink.config.GeoFlinkConfig;
import org.apache.streampipes.processor.geo.flink.processor.gridenricher.SpatialGridEnrichmentController;
@@ -35,15 +36,17 @@ public class GeoFlinkInit extends StandaloneModelSubmitter {
DeclarersSingleton.getInstance()
.add(new SpatialGridEnrichmentController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new GeoFlinkInit().init(GeoFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-processors-geo-jvm/pom.xml b/streampipes-processors-geo-jvm/pom.xml
index 3e005f4..4e74387 100644
--- a/streampipes-processors-geo-jvm/pom.xml
+++ b/streampipes-processors-geo-jvm/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
@@ -86,7 +90,6 @@
<artifactId>jts-core</artifactId>
<version>1.16.1</version>
</dependency>
-
</dependencies>
<build>
diff --git a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
index 41b30ce..bee206c 100644
--- a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
+++ b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.geo.jvm.config.GeoJvmConfig;
import org.apache.streampipes.processors.geo.jvm.jts.processor.latLngToGeo.LatLngToGeoController;
import org.apache.streampipes.processors.geo.jvm.jts.processor.setEPSG.SetEpsgController;
@@ -40,8 +41,7 @@ import org.apache.streampipes.processors.geo.jvm.processor.staticgeocoder.Static
public class GeoJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new DistanceCalculatorController())
.add(new GoogleMapsGeocodingController())
.add(new StaticGoogleMapsGeocodingController())
@@ -52,13 +52,15 @@ public class GeoJvmInit extends StandaloneModelSubmitter {
.add(new SpeedCalculatorController())
.add(new StaticDistanceCalculatorController());
-
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new GeoJvmInit().init(GeoJvmConfig.INSTANCE);
diff --git a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latLngToGeo/LatLngToGeoController.java b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latLngToGeo/LatLngToGeoController.java
index 3346632..28cdfe1 100755
--- a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latLngToGeo/LatLngToGeoController.java
+++ b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latLngToGeo/LatLngToGeoController.java
@@ -70,9 +70,6 @@ public class LatLngToGeoController extends StandaloneEventProcessingDeclarer<Lat
.domainProperty("http://www.opengis.net/ont/geosparql#Geometry")
.build())
)
-
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka())
.build();
}
diff --git a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/setEPSG/SetEpsgController.java b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/setEPSG/SetEpsgController.java
index d438d25..eb85e0b 100755
--- a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/setEPSG/SetEpsgController.java
+++ b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/setEPSG/SetEpsgController.java
@@ -58,8 +58,6 @@ public class SetEpsgController extends StandaloneEventProcessingDeclarer<SetEpsg
.domainProperty("http://data.ign.fr/def/ignf#CartesianCS")
.build())
)
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka())
.build();
}
diff --git a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/CreateTrajectoryFromPointsController.java b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/CreateTrajectoryFromPointsController.java
index 9d9f439..61e559e 100755
--- a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/CreateTrajectoryFromPointsController.java
+++ b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/CreateTrajectoryFromPointsController.java
@@ -90,9 +90,6 @@ public class CreateTrajectoryFromPointsController extends StandaloneEventProcess
"http://www.opengis.net/ont/geosparql#Geometry")
)
)
-
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka())
.build();
}
diff --git a/streampipes-processors-image-processing-jvm/pom.xml b/streampipes-processors-image-processing-jvm/pom.xml
index 1510ce3..dc27d34 100644
--- a/streampipes-processors-image-processing-jvm/pom.xml
+++ b/streampipes-processors-image-processing-jvm/pom.xml
@@ -81,6 +81,12 @@
<groupId>org.ddogleg</groupId>
<artifactId>ddogleg</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ <version>0.68.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java b/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
index 7334f73..ae624d6 100644
--- a/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
+++ b/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.imageprocessing.jvm.config.ImageProcessingJvmConfig;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.genericclassification.GenericImageClassificationController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.imagecropper.ImageCropperController;
@@ -35,19 +36,21 @@ import org.apache.streampipes.processors.imageprocessing.jvm.processor.qrreader.
public class ImageProcessingJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new ImageEnrichmentController())
.add(new ImageCropperController())
.add(new QrCodeReaderController())
.add(new GenericImageClassificationController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new ImageProcessingJvmInit().init(ImageProcessingJvmConfig.INSTANCE);
diff --git a/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java b/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
index f60bf52..8c5f0a3 100644
--- a/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
+++ b/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.pattern.detection.flink.config.PatternDetectionFlinkConfig;
import org.apache.streampipes.processors.pattern.detection.flink.processor.absence.AbsenceController;
import org.apache.streampipes.processors.pattern.detection.flink.processor.and.AndController;
@@ -46,10 +47,11 @@ public class PatternDetectionFlinkInit extends StandaloneModelSubmitter {
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new PatternDetectionFlinkInit().init(PatternDetectionFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java b/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
index acd55bc..5abf0b9 100644
--- a/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
+++ b/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.statistics.flink.config.StatisticsFlinkConfig;
import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
import org.apache.streampipes.processors.statistics.flink.processor.stat.window.StatisticsSummaryControllerWindow;
@@ -37,15 +38,17 @@ public class StatisticsFlinkInit extends StandaloneModelSubmitter {
.add(new StatisticsSummaryController())
.add(new StatisticsSummaryControllerWindow());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new StatisticsFlinkInit().init(StatisticsFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java b/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
index 183e863..afb3b34 100644
--- a/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
+++ b/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
@@ -24,6 +24,9 @@ import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
+import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
+import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.textmining.flink.config.TextMiningFlinkConfig;
import org.apache.streampipes.processors.textmining.flink.processor.wordcount.WordCountController;
@@ -34,12 +37,17 @@ public class TextMiningFlinkInit extends StandaloneModelSubmitter {
// .add(new LanguageDetectionController())
.add(new WordCountController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
+ new SpJmsProtocolFactory());
+
new TextMiningFlinkInit().init(TextMiningFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-processors-text-mining-jvm/pom.xml b/streampipes-processors-text-mining-jvm/pom.xml
index 7c93738..b813056 100644
--- a/streampipes-processors-text-mining-jvm/pom.xml
+++ b/streampipes-processors-text-mining-jvm/pom.xml
@@ -75,6 +75,12 @@
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-tools</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ <version>0.68.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java b/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
index f8eb16f..a97ad02 100644
--- a/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
+++ b/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.textmining.jvm.config.TextMiningJvmConfig;
import org.apache.streampipes.processors.textmining.jvm.processor.chunker.ChunkerController;
import org.apache.streampipes.processors.textmining.jvm.processor.language.LanguageDetectionController;
@@ -36,8 +37,7 @@ import org.apache.streampipes.processors.textmining.jvm.processor.tokenizer.Toke
public class TextMiningJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new LanguageDetectionController())
.add(new TokenizerController())
.add(new PartOfSpeechController())
@@ -45,12 +45,15 @@ public class TextMiningJvmInit extends StandaloneModelSubmitter {
.add(new NameFinderController())
.add(new SentenceDetectionController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new TextMiningJvmInit().init(TextMiningJvmConfig.INSTANCE);
diff --git a/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java b/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
index bb76672..e3e0282 100644
--- a/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
+++ b/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.transformation.flink.config.TransformationFlinkConfig;
import org.apache.streampipes.processors.transformation.flink.processor.boilerplate.BoilerplateController;
import org.apache.streampipes.processors.transformation.flink.processor.converter.FieldConverterController;
@@ -45,15 +46,17 @@ public class TransformationFlinkInit extends StandaloneModelSubmitter {
.add(new FieldRenamerController())
.add(new BoilerplateController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new TransformationFlinkInit().init(TransformationFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-processors-transformation-jvm/pom.xml b/streampipes-processors-transformation-jvm/pom.xml
index 4051933..1a27953 100644
--- a/streampipes-processors-transformation-jvm/pom.xml
+++ b/streampipes-processors-transformation-jvm/pom.xml
@@ -71,6 +71,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
index c1ef992..1d6b57d 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.transformation.jvm.config.TransformationJvmConfig;
import org.apache.streampipes.processors.transformation.jvm.processor.array.count.CountArrayController;
import org.apache.streampipes.processors.transformation.jvm.processor.array.split.SplitArrayController;
@@ -51,8 +52,7 @@ import org.apache.streampipes.processors.transformation.jvm.processor.value.dura
public class TransformationJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new CountArrayController())
.add(new SplitArrayController())
.add(new CalculateDurationController())
@@ -75,12 +75,15 @@ public class TransformationJvmInit extends StandaloneModelSubmitter {
.add(new StringToStateController())
.add(new StringCounterController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new TransformationJvmInit().init(TransformationJvmConfig.INSTANCE);
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimer.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimer.java
index 454284d..8bc71aa 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimer.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimer.java
@@ -32,6 +32,7 @@ public class StringTimer implements EventProcessor<StringTimerParameters> {
private Long timestamp;
private double outputDivisor;
private String fieldValueOfLastEvent;
+ private boolean useInputFrequencyForOutputFrequency;
@Override
public void onInvocation(StringTimerParameters stringTimerParameters,
@@ -40,6 +41,7 @@ public class StringTimer implements EventProcessor<StringTimerParameters> {
LOG = stringTimerParameters.getGraph().getLogger(StringTimer.class);
this.selectedFieldName = stringTimerParameters.getSelectedFieldName();
this.outputDivisor = stringTimerParameters.getOutputDivisor();
+ this.useInputFrequencyForOutputFrequency = stringTimerParameters.isUseInputFrequencyForOutputFrequency();
}
@@ -52,16 +54,21 @@ public class StringTimer implements EventProcessor<StringTimerParameters> {
if (this.fieldValueOfLastEvent == null) {
this.timestamp = currentTime;
} else {
- if (!this.fieldValueOfLastEvent.equals(value)) {
+ // Define if result event should be emitted or not
+ if (this.useInputFrequencyForOutputFrequency || !this.fieldValueOfLastEvent.equals(value)) {
Long difference = currentTime - this.timestamp;
double result = difference / this.outputDivisor;
inputEvent.addField(StringTimerController.MEASURED_TIME_FIELD_RUNTIME_NAME, result);
inputEvent.addField(StringTimerController.FIELD_VALUE_RUNTIME_NAME, this.fieldValueOfLastEvent);
out.collect(inputEvent);
+ }
+ // if state changes reset timestamp
+ if (!this.fieldValueOfLastEvent.equals(value)) {
timestamp = currentTime;
}
+
}
this.fieldValueOfLastEvent = value;
}
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerController.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerController.java
index f58cfaf..ae84bca 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerController.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerController.java
@@ -40,6 +40,10 @@ public class StringTimerController extends StandaloneEventProcessingDeclarer<Str
private static final String SECONDS = "Seconds";
private static final String MINUTES = "Minutes";
+ public static final String OUTPUT_FREQUENCY = "outputFrequency";
+ private static final String ON_INPUT_EVENT = "On Input Event";
+ private static final String ON_STRING_VALUE_CHANGE = "When String Value Changes";
+
public static final String MEASURED_TIME_FIELD_RUNTIME_NAME = "measured_time";
public static final String FIELD_VALUE_RUNTIME_NAME = "field_value";
@@ -56,6 +60,7 @@ public class StringTimerController extends StandaloneEventProcessingDeclarer<Str
PropertyScope.NONE)
.build())
.requiredSingleValueSelection(Labels.withId(OUTPUT_UNIT_ID), Options.from(MILLISECONDS, SECONDS, MINUTES))
+ .requiredSingleValueSelection(Labels.withId(OUTPUT_FREQUENCY), Options.from(ON_INPUT_EVENT, ON_STRING_VALUE_CHANGE))
.outputStrategy(OutputStrategies.append(
EpProperties.numberEp(Labels.withId(MEASURED_TIME_ID), MEASURED_TIME_FIELD_RUNTIME_NAME, "http://schema.org/Number"),
EpProperties.stringEp(Labels.withId(FIELD_VALUE_ID), FIELD_VALUE_RUNTIME_NAME, "http://schema.org/String")
@@ -68,6 +73,7 @@ public class StringTimerController extends StandaloneEventProcessingDeclarer<Str
String selectedFieldName = extractor.mappingPropertyValue(FIELD_ID);
String outputUnit = extractor.selectedSingleValue(OUTPUT_UNIT_ID, String.class);
+ String outputFrequency = extractor.selectedSingleValue(OUTPUT_FREQUENCY, String.class);
double outputDivisor= 1.0;
if (outputUnit.equals(SECONDS)) {
@@ -76,7 +82,12 @@ public class StringTimerController extends StandaloneEventProcessingDeclarer<Str
outputDivisor = 60000.0;
}
- StringTimerParameters params = new StringTimerParameters(graph, selectedFieldName, outputDivisor);
+ boolean useInputFrequencyForOutputFrequency = false;
+ if (ON_INPUT_EVENT.equals(outputFrequency)) {
+ useInputFrequencyForOutputFrequency = true;
+ }
+
+ StringTimerParameters params = new StringTimerParameters(graph, selectedFieldName, outputDivisor, useInputFrequencyForOutputFrequency);
return new ConfiguredEventProcessor<>(params, StringTimer::new);
}
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerParameters.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerParameters.java
index 5e26dc9..2901634 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerParameters.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerParameters.java
@@ -24,11 +24,13 @@ import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams
public class StringTimerParameters extends EventProcessorBindingParams {
private String fieldName;
private double outputDivisor;
+ private boolean useInputFrequencyForOutputFrequency;
- public StringTimerParameters(DataProcessorInvocation graph, String fieldName, double outputDivisor) {
+ public StringTimerParameters(DataProcessorInvocation graph, String fieldName, double outputDivisor, boolean useInputFrequencyForOutputFrequency) {
super(graph);
this.fieldName = fieldName;
this.outputDivisor = outputDivisor;
+ this.useInputFrequencyForOutputFrequency = useInputFrequencyForOutputFrequency;
}
public String getSelectedFieldName() {
@@ -39,4 +41,7 @@ public class StringTimerParameters extends EventProcessorBindingParams {
return outputDivisor;
}
+ public boolean isUseInputFrequencyForOutputFrequency() {
+ return useInputFrequencyForOutputFrequency;
+ }
}
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanController.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanController.java
index b9eb0b7..ab40984 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanController.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanController.java
@@ -57,8 +57,6 @@ public class TransformToBooleanController
PropertyScope.NONE)
.build())
.outputStrategy(OutputStrategies.customTransformation())
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka(), SupportedProtocols.jms())
.build();
}
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationController.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationController.java
index dfd09ae..7a7bb06 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationController.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationController.java
@@ -30,8 +30,6 @@ 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.OutputStrategies;
-import org.apache.streampipes.sdk.helpers.SupportedFormats;
-import org.apache.streampipes.sdk.helpers.SupportedProtocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.vocabulary.SO;
import org.apache.streampipes.wrapper.standalone.ConfiguredEventProcessor;
@@ -68,8 +66,6 @@ public class CalculateDurationController extends StandaloneEventProcessingDeclar
Options.from(MS, SECONDS, MINUTES, HOURS))
.outputStrategy(OutputStrategies.append(EpProperties.doubleEp(Labels.empty(), DURATION_FIELD_NAME,
SO.Number)))
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka(), SupportedProtocols.jms())
.build();
}
diff --git a/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/documentation.md b/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/documentation.md
index 8a4bd24..9c16cdd 100644
--- a/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/documentation.md
+++ b/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/documentation.md
@@ -39,11 +39,14 @@ A string field is required in the data stream.
The string field which is monitored for any value changes.
+
***
## Configuration
-(no further configuration required)
+### Output Frequency
+
+Define when an event should be emitted, either on each input event or just when the string value changes.
## Output
The following two fields are appended to the event:
diff --git a/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/strings.en b/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/strings.en
index 9034741..917e064 100644
--- a/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/strings.en
+++ b/streampipes-processors-transformation-jvm/src/main/resources/org.apache.streampipes.processors.transformation.jvm.stringoperator.timer/strings.en
@@ -13,5 +13,6 @@ fieldValue.description = The corresponding field value
outputUnit.title= Output Unit
outputUnit.description = The output unit of the measured time
-
+outputFrequency.title = Output Frequency
+outputFrequency.description = Define when the processor should emmit an output event.
diff --git a/streampipes-sinks-brokers-jvm/pom.xml b/streampipes-sinks-brokers-jvm/pom.xml
index 30deec3..4b1597d 100644
--- a/streampipes-sinks-brokers-jvm/pom.xml
+++ b/streampipes-sinks-brokers-jvm/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-pipeline-elements-shared</artifactId>
<version>0.68.0-SNAPSHOT</version>
</dependency>
diff --git a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
index 7c455e7..f7638e1 100644
--- a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
+++ b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.brokers.jvm.bufferrest.BufferRestController;
import org.apache.streampipes.sinks.brokers.jvm.config.BrokersJvmConfig;
import org.apache.streampipes.sinks.brokers.jvm.jms.JmsController;
@@ -38,8 +39,7 @@ import org.apache.streampipes.sinks.brokers.jvm.rest.RestController;
public class BrokersJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new KafkaController())
.add(new JmsController())
.add(new RestController())
@@ -48,12 +48,15 @@ public class BrokersJvmInit extends StandaloneModelSubmitter {
.add(new MqttController())
.add(new PulsarController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new BrokersJvmInit().init(BrokersJvmConfig.INSTANCE);
diff --git a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestController.java b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestController.java
index 5cbce01..1686797 100644
--- a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestController.java
+++ b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestController.java
@@ -48,8 +48,6 @@ public class BufferRestController extends StandaloneEventSinkDeclarer<BufferRest
.requiredPropertyWithNaryMapping(EpRequirements.anyProperty(), Labels.withId(
KEY + FIELDS), PropertyScope.NONE)
.build())
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka())
.requiredTextParameter(Labels.from(KEY + URI, "REST Endpoint URI", "REST Endpoint URI"))
.requiredIntegerParameter(Labels.from(KEY + COUNT, "Buffered Event Count",
"Number (1 <= x <= 1000000) of incoming events before sending data on to the given REST endpoint"),
diff --git a/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java b/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
index efd5222..f7e3367 100644
--- a/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
+++ b/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.databases.flink.config.DatabasesFlinkConfig;
import org.apache.streampipes.sinks.databases.flink.elasticsearch.ElasticSearchController;
@@ -35,15 +36,17 @@ public class DatabasesFlinkInit extends StandaloneModelSubmitter {
DeclarersSingleton.getInstance()
.add(new ElasticSearchController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new DatabasesFlinkInit().init(DatabasesFlinkConfig.INSTANCE);
}
-
}
diff --git a/streampipes-sinks-databases-jvm/pom.xml b/streampipes-sinks-databases-jvm/pom.xml
index bde459e..0820e24 100644
--- a/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-sinks-databases-jvm/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
@@ -119,7 +123,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
-
</dependencies>
<build>
diff --git a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
index e55658c..c3b4900 100644
--- a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
+++ b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.databases.jvm.config.DatabasesJvmConfig;
import org.apache.streampipes.sinks.databases.jvm.couchdb.CouchDbController;
import org.apache.streampipes.sinks.databases.jvm.ditto.DittoController;
@@ -39,8 +40,7 @@ import org.apache.streampipes.sinks.databases.jvm.redis.RedisController;
public class DatabasesJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new CouchDbController())
.add(new InfluxDbController())
.add(new UpcUaController())
@@ -50,12 +50,15 @@ public class DatabasesJvmInit extends StandaloneModelSubmitter {
.add(new RedisController())
.add(new MysqlController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new DatabasesJvmInit().init(DatabasesJvmConfig.INSTANCE);
diff --git a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/UpcUaController.java b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/UpcUaController.java
index ab03300..b5dee56 100644
--- a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/UpcUaController.java
+++ b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/UpcUaController.java
@@ -51,8 +51,6 @@ public class UpcUaController extends StandaloneEventSinkDeclarer<OpcUaParameters
.requiredPropertyWithUnaryMapping(EpRequirements.anyProperty(),
Labels.withId(MAPPING_PROPERTY_KEY),
PropertyScope.NONE).build())
- .supportedFormats(SupportedFormats.jsonFormat())
- .supportedProtocols(SupportedProtocols.kafka(), SupportedProtocols.jms())
.requiredTextParameter(Labels.withId(OPC_SERVER_KEY))
.requiredIntegerParameter(Labels.withId(OPC_PORT_KEY))
.requiredIntegerParameter(Labels.withId(OPC_NAMESPACE_INDEX_KEY))
diff --git a/streampipes-sinks-internal-jvm/pom.xml b/streampipes-sinks-internal-jvm/pom.xml
index 2bc0e58..06b2316 100644
--- a/streampipes-sinks-internal-jvm/pom.xml
+++ b/streampipes-sinks-internal-jvm/pom.xml
@@ -68,6 +68,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
diff --git a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
index 304d04b..9ad9d16 100644
--- a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
+++ b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.internal.jvm.config.SinksInternalJvmConfig;
import org.apache.streampipes.sinks.internal.jvm.dashboard.DashboardController;
import org.apache.streampipes.sinks.internal.jvm.datalake.DataLakeController;
@@ -34,18 +35,20 @@ import org.apache.streampipes.sinks.internal.jvm.notification.NotificationContro
public class SinksInternalJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new NotificationController())
.add(new DataLakeController())
.add(new DashboardController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new SinksInternalJvmInit().init(SinksInternalJvmConfig.INSTANCE);
diff --git a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
index 30e9029..760e9cd 100644
--- a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
+++ b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java
@@ -88,10 +88,6 @@ public enum SinksInternalJvmConfig implements PeConfig {
return config.getInteger(ConfigKeys.JMS_PORT);
}
- public String getJmsUrl() {
- return getJmsHost() + ":" + getJmsPort();
- }
-
public String getDataLakeHost() {
return config.getString(ConfigKeys.DATA_LAKE_HOST);
}
diff --git a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/dashboard/Dashboard.java b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/dashboard/Dashboard.java
index d79bc42..c4dd025 100644
--- a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/dashboard/Dashboard.java
+++ b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/dashboard/Dashboard.java
@@ -55,7 +55,10 @@ public class Dashboard implements EventSink<DashboardParameters> {
if (!saveToCouchDB(parameters.getGraph(), parameters)) {
throw new SpRuntimeException("The schema couldn't be stored in the couchDB");
}
- this.publisher = new ActiveMQPublisher(SinksInternalJvmConfig.INSTANCE.getJmsHost(), SinksInternalJvmConfig.INSTANCE.getJmsPort(), parameters.getElementId());
+ this.publisher = new ActiveMQPublisher(
+ SinksInternalJvmConfig.INSTANCE.getJmsHost(),
+ SinksInternalJvmConfig.INSTANCE.getJmsPort(),
+ parameters.getElementId());
this.pipelineId = parameters.getPipelineId();
}
diff --git a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
index 8f72f0e..cdcf04b 100644
--- a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
+++ b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
@@ -52,7 +52,9 @@ public class NotificationProducer implements EventSink<NotificationParameters> {
this.content = parameters.getContent();
this.correspondingPipelineId = parameters.getGraph().getCorrespondingPipeline();
this.correspondingUser = parameters.getGraph().getCorrespondingUser();
- this.publisher = new ActiveMQPublisher(SinksInternalJvmConfig.INSTANCE.getJmsHost(), SinksInternalJvmConfig.INSTANCE.getJmsPort(),
+ this.publisher = new ActiveMQPublisher(
+ SinksInternalJvmConfig.INSTANCE.getJmsHost(),
+ SinksInternalJvmConfig.INSTANCE.getJmsPort(),
"org.apache.streampipes.notifications." + this.correspondingUser);
}
diff --git a/streampipes-sinks-notifications-jvm/pom.xml b/streampipes-sinks-notifications-jvm/pom.xml
index ff29583..1b6b29c 100644
--- a/streampipes-sinks-notifications-jvm/pom.xml
+++ b/streampipes-sinks-notifications-jvm/pom.xml
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-messaging-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
</dependency>
<dependency>
diff --git a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
index 0e07595..04414fd 100644
--- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
+++ b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
@@ -26,6 +26,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.notifications.jvm.config.SinksNotificationsJvmConfig;
import org.apache.streampipes.sinks.notifications.jvm.email.EmailController;
import org.apache.streampipes.sinks.notifications.jvm.onesignal.OneSignalController;
@@ -35,19 +36,21 @@ import org.apache.streampipes.sinks.notifications.jvm.telegram.TelegramControlle
public class SinksNotificationsJvmInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton
- .getInstance()
+ DeclarersSingleton.getInstance()
.add(new EmailController())
.add(new OneSignalController())
.add(new SlackNotificationController())
.add(new TelegramController());
- DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+ DeclarersSingleton.getInstance().registerDataFormats(
+ new JsonDataFormatFactory(),
new CborDataFormatFactory(),
new SmileDataFormatFactory(),
new FstDataFormatFactory());
- DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+ DeclarersSingleton.getInstance().registerProtocols(
+ new SpKafkaProtocolFactory(),
+ new SpMqttProtocolFactory(),
new SpJmsProtocolFactory());
new SinksNotificationsJvmInit().init(SinksNotificationsJvmConfig.INSTANCE);