[incubator-streampipes] 02/03: [STREAMPIPES-404] Clean pipeline assembly on reset

[ze...@apache.org]

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

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

commit 656b3a7b097055231e7c2aa2406375f35711ace2
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Aug 12 18:10:38 2021 +0200

    [STREAMPIPES-404] Clean pipeline assembly on reset
---
 .../connect/container/master/general/ResetManagement.java        | 9 ++++++++-
 ui/cypress/support/utils/PipelineUtils.ts                        | 3 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/general/ResetManagement.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/general/ResetManagement.java
index f994fce..98f58e0 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/general/ResetManagement.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/general/ResetManagement.java
@@ -21,6 +21,8 @@ package org.apache.streampipes.connect.container.master.general;
 import org.apache.streampipes.connect.api.exception.AdapterException;
 import org.apache.streampipes.connect.container.master.management.AdapterMasterManagement;
 import org.apache.streampipes.manager.file.FileManager;
+import org.apache.streampipes.manager.pipeline.PipelineCacheManager;
+import org.apache.streampipes.manager.pipeline.PipelineCanvasMetadataCacheManager;
 import org.apache.streampipes.manager.pipeline.PipelineManager;
 import org.apache.streampipes.model.client.file.FileMetadata;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
@@ -38,12 +40,17 @@ public class ResetManagement {
     private static final Logger logger = LoggerFactory.getLogger(ResetManagement.class);
 
     /**
-     * Remove all configurations for this user. This includes [pipelines, adapters, files]
+     * Remove all configurations for this user. This includes:
+     * [pipeline assembly cache, pipelines, adapters, files]
      * @param username
      */
     public static void reset(String username) {
         logger.info("Start resetting the system");
 
+        // Clear pipeline assembly Cache
+        PipelineCacheManager.removeCachedPipeline(username);
+        PipelineCanvasMetadataCacheManager.removeCanvasMetadataFromCache(username);
+
         // Stop and delete all pipelines
         List<Pipeline> allPipelines = PipelineManager.getOwnPipelines(username);
         allPipelines.forEach(pipeline -> {
diff --git a/ui/cypress/support/utils/PipelineUtils.ts b/ui/cypress/support/utils/PipelineUtils.ts
index 83ea5d9..28ed64b 100644
--- a/ui/cypress/support/utils/PipelineUtils.ts
+++ b/ui/cypress/support/utils/PipelineUtils.ts
@@ -31,12 +31,11 @@ export class PipelineUtils {
 
     PipelineUtils.goToPipelineEditor();
 
+    // if data source type is data set, switch to this tab
     if (pipelineInput.dataSourceType === 'set') {
       cy.contains('Data Sets', { timeout: 10000 }).parent().click();
     }
 
-    // If data set go to data set tab
-
     PipelineUtils.selectDataStream(pipelineInput);
 
     PipelineUtils.configurePipeline(pipelineInput);