You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/05/24 15:24:13 UTC
[plc4x] branch develop updated: - Updated the StreamPipes
integration to the new Apache StreamPipes release 0.66.0
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 59a59b1 - Updated the StreamPipes integration to the new Apache StreamPipes release 0.66.0
59a59b1 is described below
commit 59a59b136f5dd3a910b2df1d1a831bc0d8ca29c0
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun May 24 17:24:02 2020 +0200
- Updated the StreamPipes integration to the new Apache StreamPipes release 0.66.0
---
sandbox/plc-simulator/pom.xml | 5 -
sandbox/test-streampipes-plc4x-adapters/pom.xml | 38 +++++-
.../java/streampipes/adapters/Plc4xAdapters.java | 4 +-
.../adapters/config/ConnectWorkerConfig.java | 4 +-
.../adapters/source/bacnetip/BacNetIpAdapter.java | 32 ++---
.../adapters/source/knxnetip/KnxNetIpAdapter.java | 32 ++---
sandbox/test-streampipes-plc4x-processors/pom.xml | 139 +++++++++++++++++++--
.../processors/Plc4xProcessorsInit.java | 14 +--
.../java/streampipes/processors/config/Config.java | 4 +-
.../ede/BacNetIpEdeDataEnrichmentController.java | 32 ++---
.../enrich/knxnetip/ets5/Ets5DataEnrichment.java | 8 +-
.../ets5/Ets5DataEnrichmentController.java | 30 ++---
.../ets5/Ets5DataEnrichmentParameters.java | 4 +-
.../shared/source/knxnetip/Constants.java | 1 +
14 files changed, 247 insertions(+), 100 deletions(-)
diff --git a/sandbox/plc-simulator/pom.xml b/sandbox/plc-simulator/pom.xml
index 32a4146..0cb55bc 100644
--- a/sandbox/plc-simulator/pom.xml
+++ b/sandbox/plc-simulator/pom.xml
@@ -131,11 +131,6 @@
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
diff --git a/sandbox/test-streampipes-plc4x-adapters/pom.xml b/sandbox/test-streampipes-plc4x-adapters/pom.xml
index f8791af..0f3deed 100644
--- a/sandbox/test-streampipes-plc4x-adapters/pom.xml
+++ b/sandbox/test-streampipes-plc4x-adapters/pom.xml
@@ -31,7 +31,7 @@
<name>Sandbox: StreamPipes Adapters</name>
<properties>
- <streampipes.version>0.65.0</streampipes.version>
+ <streampipes.version>0.66.0</streampipes.version>
</properties>
<build>
@@ -89,6 +89,12 @@
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-knxnetip</artifactId>
<version>0.8.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.plc4x.sandbox</groupId>
@@ -97,7 +103,7 @@
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connect-container-worker</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -137,6 +143,18 @@
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
<groupId>org.jboss.spec.javax.annotation</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>httpcore</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -166,6 +184,17 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.14.3</version>
@@ -210,6 +239,11 @@
<artifactId>jboss-logging</artifactId>
<version>3.4.1.Final</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.5.10</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/Plc4xAdapters.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/Plc4xAdapters.java
index cfae125..5141ce6 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/Plc4xAdapters.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/Plc4xAdapters.java
@@ -22,8 +22,8 @@ package org.apache.plc4x.java.streampipes.adapters;
import org.apache.plc4x.java.streampipes.adapters.config.ConnectWorkerConfig;
import org.apache.plc4x.java.streampipes.adapters.source.bacnetip.BacNetIpAdapter;
import org.apache.plc4x.java.streampipes.adapters.source.knxnetip.KnxNetIpAdapter;
-import org.streampipes.connect.container.worker.init.AdapterWorkerContainer;
-import org.streampipes.connect.init.AdapterDeclarerSingleton;
+import org.apache.streampipes.connect.container.worker.init.AdapterWorkerContainer;
+import org.apache.streampipes.connect.init.AdapterDeclarerSingleton;
public class Plc4xAdapters extends AdapterWorkerContainer {
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/config/ConnectWorkerConfig.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/config/ConnectWorkerConfig.java
index 34339df..f1b262f 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/config/ConnectWorkerConfig.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/config/ConnectWorkerConfig.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.streampipes.adapters.config;
-import org.streampipes.config.SpConfig;
-import org.streampipes.connect.init.Config;
+import org.apache.streampipes.config.SpConfig;
+import org.apache.streampipes.connect.init.Config;
public enum ConnectWorkerConfig {
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
index 57d65e8..e684aec 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
@@ -23,22 +23,22 @@ import org.apache.plc4x.java.spi.connection.DefaultNettyPlcConnection;
import org.pcap4j.core.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.streampipes.connect.adapter.Adapter;
-import org.streampipes.connect.adapter.exception.AdapterException;
-import org.streampipes.connect.adapter.exception.ParseException;
-import org.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
-import org.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.streampipes.model.AdapterType;
-import org.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
-import org.streampipes.model.connect.guess.GuessSchema;
-import org.streampipes.model.schema.EventProperty;
-import org.streampipes.model.schema.EventSchema;
-import org.streampipes.model.staticproperty.*;
-import org.streampipes.sdk.StaticProperties;
-import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
-import org.streampipes.sdk.helpers.*;
-import org.streampipes.sdk.utils.Datatypes;
+import org.apache.streampipes.connect.adapter.Adapter;
+import org.apache.streampipes.connect.adapter.exception.AdapterException;
+import org.apache.streampipes.connect.adapter.exception.ParseException;
+import org.apache.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
+import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
+import org.apache.streampipes.model.AdapterType;
+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.model.staticproperty.*;
+import org.apache.streampipes.sdk.StaticProperties;
+import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
+import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
+import org.apache.streampipes.sdk.helpers.*;
+import org.apache.streampipes.sdk.utils.Datatypes;
import java.util.*;
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
index a647cf0..a306a34 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
@@ -24,22 +24,22 @@ import org.apache.plc4x.java.spi.connection.DefaultNettyPlcConnection;
import org.apache.plc4x.java.streampipes.shared.source.knxnetip.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.streampipes.connect.adapter.Adapter;
-import org.streampipes.connect.adapter.exception.AdapterException;
-import org.streampipes.connect.adapter.exception.ParseException;
-import org.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
-import org.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.streampipes.model.AdapterType;
-import org.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
-import org.streampipes.model.connect.guess.GuessSchema;
-import org.streampipes.model.schema.EventProperty;
-import org.streampipes.model.schema.EventSchema;
-import org.streampipes.model.staticproperty.FreeTextStaticProperty;
-import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
-import org.streampipes.sdk.helpers.Labels;
-import org.streampipes.sdk.utils.Datatypes;
-import org.streampipes.vocabulary.SO;
+import org.apache.streampipes.connect.adapter.Adapter;
+import org.apache.streampipes.connect.adapter.exception.AdapterException;
+import org.apache.streampipes.connect.adapter.exception.ParseException;
+import org.apache.streampipes.connect.adapter.model.specific.SpecificDataStreamAdapter;
+import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
+import org.apache.streampipes.model.AdapterType;
+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.model.staticproperty.FreeTextStaticProperty;
+import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
+import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuilder;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.utils.Datatypes;
+import org.apache.streampipes.vocabulary.SO;
import java.util.ArrayList;
import java.util.List;
diff --git a/sandbox/test-streampipes-plc4x-processors/pom.xml b/sandbox/test-streampipes-plc4x-processors/pom.xml
index 9af84f3..56814ed 100644
--- a/sandbox/test-streampipes-plc4x-processors/pom.xml
+++ b/sandbox/test-streampipes-plc4x-processors/pom.xml
@@ -30,7 +30,7 @@
<name>Sandbox: StreamPipes Processors</name>
<properties>
- <streampipes.version>0.65.0</streampipes.version>
+ <streampipes.version>0.66.0</streampipes.version>
</properties>
<build>
@@ -47,6 +47,28 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version> <!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <!--
+ For some strange reason it keeps on complaining about classes in commons-codec,
+ which is no longer contained in any dependencies.
+ -->
+ <execution>
+ <id>enforce-ban-duplicate-classes</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -61,10 +83,16 @@
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-knxnetip</artifactId>
<version>0.8.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-wrapper</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -87,7 +115,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-wrapper-standalone</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -98,7 +126,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -114,10 +142,42 @@
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>javax.activation-api</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>httpcore</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jaxb-api</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-config</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -128,32 +188,32 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-messaging-kafka</artifactId>
<version>${streampipes.version}</version>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-cbor</artifactId>
<version>${streampipes.version}</version>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-fst</artifactId>
<version>${streampipes.version}</version>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-smile</artifactId>
<version>${streampipes.version}</version>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-json</artifactId>
<version>${streampipes.version}</version>
</dependency>
<dependency>
- <groupId>org.streampipes</groupId>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container-standalone</artifactId>
<version>${streampipes.version}</version>
<exclusions>
@@ -197,6 +257,17 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.10.0</version>
@@ -241,6 +312,52 @@
<artifactId>jboss-logging</artifactId>
<version>3.4.1.Final</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.5.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.fogsy</groupId>
+ <artifactId>empire-cp-common-utils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.fogsy</groupId>
+ <artifactId>empire-pinto</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/Plc4xProcessorsInit.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/Plc4xProcessorsInit.java
index 7ccaea9..e135dea 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/Plc4xProcessorsInit.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/Plc4xProcessorsInit.java
@@ -20,13 +20,13 @@ package org.apache.plc4x.java.streampipes.processors;
import org.apache.plc4x.java.streampipes.processors.config.Config;
import org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5.Ets5DataEnrichmentController;
-import org.streampipes.container.init.DeclarersSingleton;
-import org.streampipes.container.standalone.init.StandaloneModelSubmitter;
-import org.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.container.init.DeclarersSingleton;
+import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
+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.kafka.SpKafkaProtocolFactory;
public class Plc4xProcessorsInit extends StandaloneModelSubmitter {
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/config/Config.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/config/Config.java
index 34f75b9..ea81de0 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/config/Config.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/config/Config.java
@@ -19,8 +19,8 @@ under the License.
package org.apache.plc4x.java.streampipes.processors.config;
-import org.streampipes.config.SpConfig;
-import org.streampipes.container.model.PeConfig;
+import org.apache.streampipes.config.SpConfig;
+import org.apache.streampipes.container.model.PeConfig;
public enum Config implements PeConfig {
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
index a5d7389..dced5a1 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
@@ -21,22 +21,22 @@ package org.apache.plc4x.java.streampipes.processors.enrich.bacnetip.ede;
import org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5.Ets5DataEnrichment;
import org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5.Ets5DataEnrichmentParameters;
import org.apache.plc4x.java.streampipes.shared.source.knxnetip.Constants;
-import org.streampipes.model.DataProcessorType;
-import org.streampipes.model.graph.DataProcessorDescription;
-import org.streampipes.model.graph.DataProcessorInvocation;
-import org.streampipes.model.schema.PropertyScope;
-import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.streampipes.sdk.builder.ProcessingElementBuilder;
-import org.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
-import org.streampipes.sdk.helpers.EpRequirements;
-import org.streampipes.sdk.helpers.Labels;
-import org.streampipes.sdk.helpers.Locales;
-import org.streampipes.sdk.helpers.OutputStrategies;
-import org.streampipes.sdk.utils.Assets;
-import org.streampipes.sdk.utils.Datatypes;
-import org.streampipes.wrapper.standalone.ConfiguredEventProcessor;
-import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
+import org.apache.streampipes.model.DataProcessorType;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.model.schema.PropertyScope;
+import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
+import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
+import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
+import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
+import org.apache.streampipes.sdk.helpers.EpRequirements;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.helpers.OutputStrategies;
+import org.apache.streampipes.sdk.utils.Assets;
+import org.apache.streampipes.sdk.utils.Datatypes;
+import org.apache.streampipes.wrapper.standalone.ConfiguredEventProcessor;
+import org.apache.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
public class BacNetIpEdeDataEnrichmentController extends StandaloneEventProcessingDeclarer<Ets5DataEnrichmentParameters> {
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
index baa50fb..f764578 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
@@ -27,10 +27,10 @@ import org.apache.plc4x.java.knxnetip.ets5.model.GroupAddress;
import org.apache.plc4x.java.knxnetip.readwrite.io.KnxDatapointIO;
import org.apache.plc4x.java.spi.generation.ParseException;
import org.apache.plc4x.java.spi.generation.ReadBuffer;
-import org.streampipes.model.runtime.Event;
-import org.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.streampipes.wrapper.routing.SpOutputCollector;
-import org.streampipes.wrapper.runtime.EventProcessor;
+import org.apache.streampipes.model.runtime.Event;
+import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.wrapper.routing.SpOutputCollector;
+import org.apache.streampipes.wrapper.runtime.EventProcessor;
import java.io.File;
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
index 294bab2..449df83 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
@@ -19,21 +19,21 @@ under the License.
package org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5;
import org.apache.plc4x.java.streampipes.shared.source.knxnetip.Constants;
-import org.streampipes.model.DataProcessorType;
-import org.streampipes.model.graph.DataProcessorDescription;
-import org.streampipes.model.graph.DataProcessorInvocation;
-import org.streampipes.model.schema.PropertyScope;
-import org.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.streampipes.sdk.builder.ProcessingElementBuilder;
-import org.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
-import org.streampipes.sdk.helpers.EpRequirements;
-import org.streampipes.sdk.helpers.Labels;
-import org.streampipes.sdk.helpers.Locales;
-import org.streampipes.sdk.helpers.OutputStrategies;
-import org.streampipes.sdk.utils.Datatypes;
-import org.streampipes.wrapper.standalone.ConfiguredEventProcessor;
-import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
+import org.apache.streampipes.model.DataProcessorType;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.model.schema.PropertyScope;
+import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
+import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
+import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
+import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
+import org.apache.streampipes.sdk.helpers.EpRequirements;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+import org.apache.streampipes.sdk.helpers.OutputStrategies;
+import org.apache.streampipes.sdk.utils.Datatypes;
+import org.apache.streampipes.wrapper.standalone.ConfiguredEventProcessor;
+import org.apache.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
import java.io.IOException;
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
index cfe2fbe..6928cf4 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
@@ -18,8 +18,8 @@ under the License.
*/
package org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5;
-import org.streampipes.model.graph.DataProcessorInvocation;
-import org.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
public class Ets5DataEnrichmentParameters extends EventProcessorBindingParams {
diff --git a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
index 95b2604..e337b95 100644
--- a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
+++ b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
@@ -24,4 +24,5 @@ public class Constants {
public static final String KNXNET_ID_SOURCE_ADDRESS = KNXNET_ID + "/source-address";
public static final String KNXNET_ID_DESTINATION_ADDRESS = KNXNET_ID + "/destination-address";
public static final String KNXNET_ID_PAYLOAD = KNXNET_ID + "/payload";
+
}