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 2019/12/05 12:30:09 UTC
[plc4x] branch feature/knxnet-ip updated: - Refactored the
StreamPipes components - Updated to the latest SP version
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/knxnet-ip
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/knxnet-ip by this push:
new 3887da1 - Refactored the StreamPipes components - Updated to the latest SP version
3887da1 is described below
commit 3887da17c99f259f1b7e0266da44603f23b0d44f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Dec 5 13:29:58 2019 +0100
- Refactored the StreamPipes components
- Updated to the latest SP version
---
.../apache/plc4x/java/streampipes/adapters/Plc4xAdapters.java | 4 ++--
.../adapters/source/{ => bacnetip}/BacNetIpAdapter.java | 2 +-
.../adapters/source/{ => knxnetip}/KnxNetIpAdapter.java | 6 +++---
.../plc4x/java/streampipes/processors/Plc4xProcessorsInit.java | 3 ++-
.../bacnetip/ede/BacNetIpEdeDataEnrichmentController.java} | 10 ++++++----
.../knxnetip}/ets5/Ets5DataEnrichment.java | 2 +-
.../knxnetip}/ets5/Ets5DataEnrichmentController.java | 6 +++---
.../knxnetip}/ets5/Ets5DataEnrichmentParameters.java | 2 +-
.../strings.en | 4 ++--
.../strings.en | 4 ++--
sandbox/test-streampipes-plc4x-shared/pom.xml | 1 +
.../streampipes/shared/{ => source/bacnetip}/Constants.java | 8 +++-----
.../streampipes/shared/{ => source/knxnetip}/Constants.java | 2 +-
13 files changed, 28 insertions(+), 26 deletions(-)
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 69ea61c..cfae125 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
@@ -20,8 +20,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.BacNetIpAdapter;
-import org.apache.plc4x.java.streampipes.adapters.source.KnxNetIpAdapter;
+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;
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/BacNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
similarity index 99%
rename from sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/BacNetIpAdapter.java
rename to sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
index cf8d1e0..cb30ed7 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/BacNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.streampipes.adapters.source;
+package org.apache.plc4x.java.streampipes.adapters.source.bacnetip;
import io.netty.channel.ChannelHandlerContext;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/KnxNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
similarity index 98%
rename from sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/KnxNetIpAdapter.java
rename to sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
index 6d6f779..5580b5e 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/KnxNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.streampipes.adapters.source;
+package org.apache.plc4x.java.streampipes.adapters.source.knxnetip;
import io.netty.channel.ChannelHandlerContext;
import org.apache.commons.codec.binary.Hex;
@@ -28,7 +28,7 @@ import org.apache.plc4x.java.base.connection.UdpSocketChannelFactory;
import org.apache.plc4x.java.base.messages.PlcRequestContainer;
import org.apache.plc4x.java.knxnetip.connection.KnxNetIpConnection;
import org.apache.plc4x.java.knxnetip.readwrite.*;
-import org.apache.plc4x.java.streampipes.shared.Constants;
+import org.apache.plc4x.java.streampipes.shared.source.knxnetip.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.streampipes.connect.adapter.Adapter;
@@ -77,7 +77,7 @@ public class KnxNetIpAdapter extends SpecificDataStreamAdapter {
@Override
public SpecificAdapterStreamDescription declareModel() {
- SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(Constants.KNXNET_ID, "KNCnet/IP", "")
+ SpecificAdapterStreamDescription description = SpecificDataStreamAdapterBuilder.create(Constants.KNXNET_ID, "KNXnet/IP", "")
.iconUrl("knxnetip.png")
.category(AdapterType.Manufacturing)
.requiredTextParameter(Labels.from("gatewayIp", "KNXnet/IP Gateway", "Ip of the KNX gateway."))
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 d62f0fb..7ccaea9 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
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.streampipes.processors;
import org.apache.plc4x.java.streampipes.processors.config.Config;
-import org.apache.plc4x.java.streampipes.processors.processors.ets5.Ets5DataEnrichmentController;
+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;
@@ -34,6 +34,7 @@ public class Plc4xProcessorsInit extends StandaloneModelSubmitter {
// Declare the processors.
DeclarersSingleton
.getInstance()
+// .add(new BacNetIpEdeDataEnrichmentController())
.add(new Ets5DataEnrichmentController());
// Declare the data formats the
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
similarity index 90%
copy from sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java
copy to sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
index 3c8a801..a5d7389 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/bacnetip/ede/BacNetIpEdeDataEnrichmentController.java
@@ -16,9 +16,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.streampipes.processors.processors.ets5;
+package org.apache.plc4x.java.streampipes.processors.enrich.bacnetip.ede;
-import org.apache.plc4x.java.streampipes.shared.Constants;
+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;
@@ -36,9 +38,9 @@ import org.streampipes.sdk.utils.Datatypes;
import org.streampipes.wrapper.standalone.ConfiguredEventProcessor;
import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
-public class Ets5DataEnrichmentController extends StandaloneEventProcessingDeclarer<Ets5DataEnrichmentParameters> {
+public class BacNetIpEdeDataEnrichmentController extends StandaloneEventProcessingDeclarer<Ets5DataEnrichmentParameters> {
- public static final String ID = "org.apache.plc4x.streampipes.processors";
+ public static final String ID = "org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede";
private static final String DESTINATION_ID_MAPPING = "destination-id-mapping";
private static final String PAYLOAD_ID_MAPPING = "payload-id-mapping";
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichment.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
similarity index 98%
rename from sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichment.java
rename to sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
index ec86a7e..d9d1bf7 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichment.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichment.java
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.apache.plc4x.java.streampipes.processors.processors.ets5;
+package org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
similarity index 96%
rename from sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java
rename to sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
index 3c8a801..d5420aa 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentController.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentController.java
@@ -16,9 +16,9 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.streampipes.processors.processors.ets5;
+package org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5;
-import org.apache.plc4x.java.streampipes.shared.Constants;
+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;
@@ -38,7 +38,7 @@ import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDecl
public class Ets5DataEnrichmentController extends StandaloneEventProcessingDeclarer<Ets5DataEnrichmentParameters> {
- public static final String ID = "org.apache.plc4x.streampipes.processors";
+ public static final String ID = "org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5";
private static final String DESTINATION_ID_MAPPING = "destination-id-mapping";
private static final String PAYLOAD_ID_MAPPING = "payload-id-mapping";
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentParameters.java b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
similarity index 95%
rename from sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentParameters.java
rename to sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
index e6f010f..cfe2fbe 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/processors/ets5/Ets5DataEnrichmentParameters.java
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/java/org/apache/plc4x/java/streampipes/processors/enrich/knxnetip/ets5/Ets5DataEnrichmentParameters.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.streampipes.processors.processors.ets5;
+package org.apache.plc4x.java.streampipes.processors.enrich.knxnetip.ets5;
import org.streampipes.model.graph.DataProcessorInvocation;
import org.streampipes.wrapper.params.binding.EventProcessorBindingParams;
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en b/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede/strings.en
similarity index 78%
copy from sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en
copy to sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede/strings.en
index 0cabe4e..e605754 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede/strings.en
@@ -17,8 +17,8 @@
# under the License.
#
-org.apache.plc4x.streampipes.processors.title=ETS5
-org.apache.plc4x.streampipes.processors.description=Processor that interprets a data stream from a KXNnet/IP Datasource according to the settings in the ETS5 'knxproj' file
+org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede.title=EDE
+org.apache.plc4x.streampipes.processors.enrich.bacnetip.ede.description=Processor that interprets a data stream from a BACnet/IP Datasource according to the settings in the BACnet 'ede' file
payload-id-mapping.title=Payload Id Field
payload-id-mapping.description=
diff --git a/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en b/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5/strings.en
similarity index 78%
rename from sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en
rename to sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5/strings.en
index 0cabe4e..ed9a3d3 100644
--- a/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors/strings.en
+++ b/sandbox/test-streampipes-plc4x-processors/src/main/resources/org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5/strings.en
@@ -17,8 +17,8 @@
# under the License.
#
-org.apache.plc4x.streampipes.processors.title=ETS5
-org.apache.plc4x.streampipes.processors.description=Processor that interprets a data stream from a KXNnet/IP Datasource according to the settings in the ETS5 'knxproj' file
+org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5.title=ETS5
+org.apache.plc4x.streampipes.processors.enrich.knxnetip.ets5.description=Processor that interprets a data stream from a KXNnet/IP Datasource according to the settings in the ETS5 'knxproj' file
payload-id-mapping.title=Payload Id Field
payload-id-mapping.description=
diff --git a/sandbox/test-streampipes-plc4x-shared/pom.xml b/sandbox/test-streampipes-plc4x-shared/pom.xml
index 6778177..0a00d29 100644
--- a/sandbox/test-streampipes-plc4x-shared/pom.xml
+++ b/sandbox/test-streampipes-plc4x-shared/pom.xml
@@ -29,5 +29,6 @@
</parent>
<artifactId>test-streampipes-plc4x-shared</artifactId>
+ <name>Sandbox: StreamPipes Shared</name>
</project>
\ No newline at end of file
diff --git a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/bacnetip/Constants.java
similarity index 65%
copy from sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java
copy to sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/bacnetip/Constants.java
index 8e1e6f9..24edc3b 100644
--- a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java
+++ b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/bacnetip/Constants.java
@@ -13,12 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.apache.plc4x.java.streampipes.shared;
+package org.apache.plc4x.java.streampipes.shared.source.bacnetip;
public class Constants {
- public static final String KNXNET_ID = "http://plc4x.apache.org/streampipes/source/knxnetip";
- 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";
+ public static final String KNXNET_ID = "http://plc4x.apache.org/streampipes/source/bacnetup";
+
}
diff --git a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
similarity index 93%
rename from sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java
rename to sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
index 8e1e6f9..f6e101f 100644
--- a/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/Constants.java
+++ b/sandbox/test-streampipes-plc4x-shared/src/main/java/org/apache/plc4x/java/streampipes/shared/source/knxnetip/Constants.java
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.apache.plc4x.java.streampipes.shared;
+package org.apache.plc4x.java.streampipes.shared.source.knxnetip;
public class Constants {