You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/10/25 19:57:52 UTC

[incubator-streampipes] branch dev updated: [STREAMPIPES-603] Improve registration of functions

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

riemer 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 302fcc348 [STREAMPIPES-603] Improve registration of functions
302fcc348 is described below

commit 302fcc34867ce79c29fa1c78431bf41d21dc0d93
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Oct 25 21:57:42 2022 +0200

    [STREAMPIPES-603] Improve registration of functions
---
 .../apache/streampipes/client/api/AbstractClientApi.java |  7 +++++++
 .../streampipes/client/api/AbstractTypedClientApi.java   |  5 -----
 .../java/org/apache/streampipes/client/api/AdminApi.java |  8 ++++++--
 .../apache/streampipes/client/api/CustomRequestApi.java  |  4 ++++
 .../function/FunctionDeregistrationHandler.java          |  4 +++-
 .../extensions/function/StreamPipesFunctionHandler.java  | 16 +++++++++++-----
 .../manager/function/FunctionRegistrationService.java    |  4 ++--
 .../apache/streampipes/rest/impl/FunctionsResource.java  |  6 +++---
 8 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
index 0f5342757..887399a83 100644
--- a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
+++ b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
@@ -18,12 +18,14 @@
 package org.apache.streampipes.client.api;
 
 import org.apache.streampipes.client.http.DeleteRequest;
+import org.apache.streampipes.client.http.GetRequest;
 import org.apache.streampipes.client.http.PostRequestWithPayloadResponse;
 import org.apache.streampipes.client.http.PostRequestWithoutPayloadResponse;
 import org.apache.streampipes.client.model.StreamPipesClientConfig;
 import org.apache.streampipes.client.serializer.ObjectSerializer;
 import org.apache.streampipes.client.serializer.Serializer;
 import org.apache.streampipes.client.util.StreamPipesApiPath;
+import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 
 public class AbstractClientApi {
 
@@ -60,4 +62,9 @@ public class AbstractClientApi {
     return new PostRequestWithPayloadResponse<>(clientConfig, apiPath, serializer, object, responseClass)
             .executeRequest();
   }
+
+  protected <O> O getSingle(StreamPipesApiPath apiPath, Class<O> targetClass) throws SpRuntimeException {
+    ObjectSerializer<Void, O> serializer = new ObjectSerializer<>();
+    return new GetRequest<>(clientConfig, apiPath, targetClass, serializer).executeRequest();
+  }
 }
diff --git a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
index eae26502f..abd60c439 100644
--- a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
+++ b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
@@ -45,10 +45,5 @@ public abstract class AbstractTypedClientApi<T> extends AbstractClientApi {
     return new GetRequest<>(clientConfig, apiPath, targetClass, serializer).executeRequest();
   }
 
-  protected <O> O getSingle(StreamPipesApiPath apiPath, Class<O> targetClass) throws SpRuntimeException {
-    ObjectSerializer<Void, O> serializer = new ObjectSerializer<>();
-    return new GetRequest<>(clientConfig, apiPath, targetClass, serializer).executeRequest();
-  }
-
   protected abstract StreamPipesApiPath getBaseResourcePath();
 }
diff --git a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AdminApi.java b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AdminApi.java
index 2b47102fd..6f5604e2b 100644
--- a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AdminApi.java
+++ b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AdminApi.java
@@ -39,8 +39,8 @@ public class AdminApi extends AbstractClientApi {
     post(getFunctionsPath(), functions);
   }
 
-  public void deregisterFunctions(List<FunctionDefinition> functions) {
-    delete(getFunctionsPath(), functions, Message.class);
+  public void deregisterFunction(String functionId) {
+    delete(getDeleteFunctionPath(functionId), Message.class);
   }
 
   private StreamPipesApiPath getConnectPath() {
@@ -56,4 +56,8 @@ public class AdminApi extends AbstractClientApi {
         .fromBaseApiPath()
         .addToPath("functions");
   }
+
+  private StreamPipesApiPath getDeleteFunctionPath(String functionId) {
+    return getFunctionsPath().addToPath(functionId);
+  }
 }
diff --git a/streampipes-client/src/main/java/org/apache/streampipes/client/api/CustomRequestApi.java b/streampipes-client/src/main/java/org/apache/streampipes/client/api/CustomRequestApi.java
index 713e39f42..b4e679fef 100644
--- a/streampipes-client/src/main/java/org/apache/streampipes/client/api/CustomRequestApi.java
+++ b/streampipes-client/src/main/java/org/apache/streampipes/client/api/CustomRequestApi.java
@@ -30,4 +30,8 @@ public class CustomRequestApi extends AbstractClientApi {
     post(StreamPipesApiPath.fromStreamPipesBasePath(apiPath), payload);
   }
 
+  public <T> T sendGet(String apiPath, Class<T> responseClass) {
+    return getSingle(StreamPipesApiPath.fromStreamPipesBasePath(apiPath), responseClass);
+  }
+
 }
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
index 5a9cb2641..394beeea7 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/FunctionDeregistrationHandler.java
@@ -35,7 +35,9 @@ public class FunctionDeregistrationHandler extends RegistrationHandler {
 
   @Override
   protected void performRequest(StreamPipesClient client) {
-    client.adminApi().deregisterFunctions(functions);
+    functions.forEach(fn ->
+        client.adminApi().deregisterFunction(fn.getFunctionId().getId())
+    );
   }
 
   @Override
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
index 796ee0ddd..be4726e66 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
@@ -21,8 +21,8 @@ package org.apache.streampipes.container.extensions.function;
 import org.apache.streampipes.container.declarer.IStreamPipesFunctionDeclarer;
 import org.apache.streampipes.container.init.DeclarersSingleton;
 import org.apache.streampipes.model.function.FunctionDefinition;
-import org.apache.streampipes.model.function.FunctionId;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,12 +39,18 @@ public enum StreamPipesFunctionHandler {
   }
 
   public void initializeFunctions() {
-    DeclarersSingleton.getInstance().getFunctions().forEach((key, value) -> {
-      Runnable r = value::invokeRuntime;
+    initializeFunctions(DeclarersSingleton.getInstance().getFunctions().values());
+  }
+
+  public void initializeFunctions(Collection<IStreamPipesFunctionDeclarer> functions) {
+    functions.forEach(function -> {
+      Runnable r = function::invokeRuntime;
       new Thread(r).start();
-      runningInstances.put(key, value);
+      runningInstances.put(function.getFunctionId().getId(), function);
     });
-    new Thread(new FunctionRegistrationHandler(getFunctionDefinitions())).start();
+    if (!(runningInstances.isEmpty())) {
+      new Thread(new FunctionRegistrationHandler(getFunctionDefinitions())).start();
+    }
   }
 
   public void cleanupFunctions() {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionRegistrationService.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionRegistrationService.java
index e6382486c..33e5fe790 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionRegistrationService.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionRegistrationService.java
@@ -42,8 +42,8 @@ public enum FunctionRegistrationService {
     this.registeredFunctions.put(function.getFunctionId().getId(), function);
   }
 
-  public void deregisterFunction(FunctionDefinition function) {
+  public void deregisterFunction(String functionId) {
 
-    this.registeredFunctions.remove(function.getFunctionId().getId());
+    this.registeredFunctions.remove(functionId);
   }
 }
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/FunctionsResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/FunctionsResource.java
index ffaafbe9a..04ee09b87 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/FunctionsResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/FunctionsResource.java
@@ -21,7 +21,6 @@ package org.apache.streampipes.rest.impl;
 import org.apache.streampipes.manager.function.FunctionRegistrationService;
 import org.apache.streampipes.manager.monitoring.pipeline.ExtensionsLogProvider;
 import org.apache.streampipes.model.function.FunctionDefinition;
-import org.apache.streampipes.model.function.FunctionId;
 import org.apache.streampipes.model.message.Notifications;
 import org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResource;
 
@@ -48,9 +47,10 @@ public class FunctionsResource extends AbstractAuthGuardedRestResource {
   }
 
   @DELETE
+  @Path("{functionId}")
   @Produces(MediaType.APPLICATION_JSON)
-  public Response deregisterFunction(List<FunctionDefinition> functions) {
-    functions.forEach(FunctionRegistrationService.INSTANCE::deregisterFunction);
+  public Response deregisterFunction(@PathParam("functionId") String functionId) {
+    FunctionRegistrationService.INSTANCE.deregisterFunction(functionId);
     return ok(Notifications.success("Function successfully deregistered"));
   }