[#227] Fix module loading when contexts.keepUpdated=true

Module configuration was not updated previously, because it was taken from provided snapshot of the pipeline (configModel). Now we are loading model from the filesystem instead.
kbss-cvut · Feb 24, 2025 · 2cc24d5 · 2cc24d5
1 parent 8c744d6
commit 2cc24d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/manager/SPipesScriptManager.java b/s-pipes-core/src/main/java/cz/cvut/spipes/manager/SPipesScriptManager.java
@@ -88,7 +88,7 @@ public Module loadModule(final String moduleId,
 
         // TODO check moduleTypeUri
 
-        return PipelineFactory.loadPipeline(scriptsRepository.getResource(resourceUri, resourceContextUri));
+        return PipelineFactory.loadModule(scriptsRepository.getResource(resourceUri, resourceContextUri));
     }
 
     public Module loadFunction(String functionId) {

diff --git a/s-pipes-web/src/main/java/cz/cvut/spipes/rest/SPipesServiceController.java b/s-pipes-web/src/main/java/cz/cvut/spipes/rest/SPipesServiceController.java
@@ -33,6 +33,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cz.cvut.spipes.rest.util.ContextLoaderHelper.isKeepUpdated;
+
 @Slf4j
 @RestController
 @EnableWebMvc
@@ -221,7 +223,12 @@ private Model runModule(final Model inputDataModel, final MultiValueMap<String,
 
         ExecutionEngine engine = createExecutionEngine(configModel);
         ContextLoaderHelper.updateContextsIfNecessary(scriptManager);
-        Module module = PipelineFactory.loadModule(configModel.createResource(id));
+        Module module = null;
+        if (isKeepUpdated()) {
+            module = scriptManager.loadModule(id, null, null);
+        } else {
+            module = PipelineFactory.loadModule(configModel.createResource(id));
+        }
         if (module == null) {
             throw new SPipesServiceException("Cannot load module with id=" + id);
         }