You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/03/26 21:53:06 UTC

[incubator-streampipes] branch dev updated: Fix jvm sinks archetype for new release

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

zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new bce3723  Fix jvm sinks archetype for new release
bce3723 is described below

commit bce372392bce8055b7b3c6b10c8a06f7702a66b3
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Mar 26 22:52:37 2020 +0100

    Fix jvm sinks archetype for new release
---
 .../archetype-resources/deployment/docker-compose.yml       | 13 -------------
 .../main/resources/archetype-resources/deployment/system    | 11 -----------
 .../archetype-resources/deployment/docker-compose.yml       | 13 -------------
 .../main/resources/archetype-resources/deployment/system    | 11 -----------
 .../archetype-resources/deployment/docker-compose.yml       | 13 -------------
 .../main/resources/archetype-resources/deployment/system    | 11 -----------
 .../archetype-resources/deployment/docker-compose.yml       | 13 -------------
 .../main/resources/archetype-resources/deployment/system    | 11 -----------
 .../src/main/resources/archetype-resources/pom.xml          |  5 +++++
 .../java/pe/sink/__packageName__/__classNamePrefix__.java   |  7 ++++---
 .../sink/__packageName__/__classNamePrefix__Controller.java |  2 --
 11 files changed, 9 insertions(+), 101 deletions(-)

diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml
deleted file mode 100644
index 1a528c9..0000000
--- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-services:
-  ${artifactId}:
-    image: ${artifactId}
-    depends_on:
-      - "consul"
-#    ports:
-#      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-    networks:
-      spnet:
-
diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system
deleted file mode 100644
index 8bfd130..0000000
--- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system
+++ /dev/null
@@ -1,11 +0,0 @@
-activemq
-kafka
-zookeeper
-swagger-ui
-connect-master
-connect-worker
-couchdb
-backend
-nginx
-kafka-rest
-testarchetype
\ No newline at end of file
diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml
deleted file mode 100644
index 1a528c9..0000000
--- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-services:
-  ${artifactId}:
-    image: ${artifactId}
-    depends_on:
-      - "consul"
-#    ports:
-#      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-    networks:
-      spnet:
-
diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system
deleted file mode 100644
index 8bfd130..0000000
--- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system
+++ /dev/null
@@ -1,11 +0,0 @@
-activemq
-kafka
-zookeeper
-swagger-ui
-connect-master
-connect-worker
-couchdb
-backend
-nginx
-kafka-rest
-testarchetype
\ No newline at end of file
diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml
deleted file mode 100644
index 1a528c9..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-services:
-  ${artifactId}:
-    image: ${artifactId}
-    depends_on:
-      - "consul"
-#    ports:
-#      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-    networks:
-      spnet:
-
diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system
deleted file mode 100644
index 8bfd130..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system
+++ /dev/null
@@ -1,11 +0,0 @@
-activemq
-kafka
-zookeeper
-swagger-ui
-connect-master
-connect-worker
-couchdb
-backend
-nginx
-kafka-rest
-testarchetype
\ No newline at end of file
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml
deleted file mode 100644
index 1a528c9..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-services:
-  ${artifactId}:
-    image: ${artifactId}
-    depends_on:
-      - "consul"
-#    ports:
-#      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-    networks:
-      spnet:
-
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system
deleted file mode 100644
index 8bfd130..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system
+++ /dev/null
@@ -1,11 +0,0 @@
-activemq
-kafka
-zookeeper
-swagger-ui
-connect-master
-connect-worker
-couchdb
-backend
-nginx
-kafka-rest
-testarchetype
\ No newline at end of file
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml
index 3dd1e08..e1f4d09 100644
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml
@@ -13,6 +13,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.streampipes</groupId>
+            <artifactId>streampipes-commons</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-wrapper-standalone</artifactId>
             <version>${sp.version}</version>
         </dependency>
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__.java
index bfcc992..e26fc23 100644
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__.java
+++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__.java
@@ -4,6 +4,7 @@
 
 package ${package}.pe.sink.${packageName};
 
+import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
 import org.apache.streampipes.wrapper.runtime.EventSink;
@@ -16,17 +17,17 @@ public class ${classNamePrefix} implements EventSink<${classNamePrefix}Parameter
 private static Logger LOG;
 
   @Override
-  public void onInvocation(${classNamePrefix}Parameters parameters, EventSinkRuntimeContext runtimeContext) {
+  public void onInvocation(${classNamePrefix}Parameters parameters, EventSinkRuntimeContext runtimeContext) throws SpRuntimeException {
 
   }
 
   @Override
-  public void onEvent(Event event) {
+  public void onEvent(Event event) throws SpRuntimeException {
 
   }
 
   @Override
-  public void onDetach() {
+  public void onDetach() throws SpRuntimeException {
 
   }
 }
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java
index a84278e..0dbf519 100644
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java
+++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java
@@ -32,8 +32,6 @@ public class ${classNamePrefix}Controller extends StandaloneEventSinkDeclarer<${
 							.create()
 							.requiredProperty(EpRequirements.anyProperty())
 							.build())
-						.supportedFormats(SupportedFormats.jsonFormat())
-						.supportedProtocols(SupportedProtocols.kafka())
 						.requiredTextParameter(Labels.from(EXAMPLE_KEY, "Example Text Parameter", "Example " +
 				"Text Parameter Description"))
 						.build();