[incubator-streampipes] 01/03: [STREAMPIPES-494] Refactor pipeline update

[ri...@apache.org]

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

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

commit 494743f7969f08b4f4e7631128ce4e162b92273d
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 5 16:27:25 2022 +0100

    [STREAMPIPES-494] Refactor pipeline update
---
 .../manager/execution/http/PipelineStorageService.java         | 10 ++++++----
 .../org/apache/streampipes/rest/impl/PipelineResource.java     |  2 +-
 .../pipeline-assembly/pipeline-assembly.component.ts           |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/PipelineStorageService.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/PipelineStorageService.java
index 9914e55..7a0d764 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/PipelineStorageService.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/PipelineStorageService.java
@@ -20,12 +20,11 @@ package org.apache.streampipes.manager.execution.http;
 
 import org.apache.streampipes.manager.data.PipelineGraph;
 import org.apache.streampipes.manager.data.PipelineGraphBuilder;
-import org.apache.streampipes.manager.matching.InvocationGraphBuilder;
-import org.apache.streampipes.resource.management.secret.SecretProvider;
 import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 import org.apache.streampipes.model.pipeline.Pipeline;
+import org.apache.streampipes.resource.management.secret.SecretProvider;
 import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import java.util.List;
@@ -51,8 +50,11 @@ public class PipelineStorageService {
 
   private void preparePipeline() {
     PipelineGraph pipelineGraph = new PipelineGraphBuilder(pipeline).buildGraph();
-    InvocationGraphBuilder builder = new InvocationGraphBuilder(pipelineGraph, pipeline.getPipelineId());
-    List<InvocableStreamPipesEntity> graphs = builder.buildGraphs();
+    List<InvocableStreamPipesEntity> graphs = pipelineGraph
+            .vertexSet()
+            .stream()
+            .filter(v -> v instanceof InvocableStreamPipesEntity).map(v -> (InvocableStreamPipesEntity) v)
+            .collect(Collectors.toList());
     encryptSecrets(graphs);
 
     List<DataSinkInvocation> secs = filter(graphs, DataSinkInvocation.class);
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
index 1684393..7e4a8b7 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
@@ -248,7 +248,7 @@ public class PipelineResource extends AbstractAuthGuardedRestResource {
                                     Pipeline pipeline) {
     Pipeline storedPipeline = getPipelineStorage().getPipeline(pipelineId);
     if (!storedPipeline.isRunning()) {
-      storedPipeline.setActions(pipeline.getActions());
+      storedPipeline.setStreams(pipeline.getStreams());
       storedPipeline.setSepas(pipeline.getSepas());
       storedPipeline.setActions(pipeline.getActions());
     }
diff --git a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
index 28f6b40..87a422e 100644
--- a/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
+++ b/ui/src/app/editor/components/pipeline-assembly/pipeline-assembly.component.ts
@@ -216,7 +216,9 @@ export class PipelineAssemblyComponent implements OnInit, AfterViewInit {
      * Sends the pipeline to the server
      */
     submit() {
+        console.log(this.rawPipelineModel);
         const pipeline = this.objectProvider.makeFinalPipeline(this.rawPipelineModel);
+        console.log(pipeline);
         this.pipelinePositioningService.collectPipelineElementPositions(this.pipelineCanvasMetadata, this.rawPipelineModel);
         pipeline.name = this.currentPipelineName;
         pipeline.description = this.currentPipelineDescription;