[#227] Implemented a sanity check for loading of modules

kbss-cvut · Jul 28, 2024 · 79cc0dd · 79cc0dd
1 parent 5c827bd
commit 79cc0dd
Show file tree

Hide file tree

Showing 4 changed files with 13 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
@@ -116,6 +116,10 @@ public Set<String> getGlobalScripts() {
         return globalScripts;
     }
 
+    public boolean doesRegistryContainsEntity(String entityId) {
+        return moduleRegistry.doesContextContainsEntity(entityId);
+    }
+
 
     // id -> contexts
     // function id-s

diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/registry/JenaResourceRegistry.java b/s-pipes-core/src/main/java/cz/cvut/spipes/registry/JenaResourceRegistry.java
@@ -120,6 +120,10 @@ public Set<String> getContexts(String entityId) {
         return getResourceUri(entityId, contexts.iterator().next());
     }
 
+    public boolean doesContextContainsEntity(String entityId) {
+        return fullName2ContextsMap.containsKey(entityId);
+    }
+
 
 
     private Set<String> getLocalName2Contexts(String localEntityId) {
@@ -145,6 +149,7 @@ private boolean isLocalNameEntityId(String entityId) {
         return !(isPrefixedEntityId(entityId) || isFullNameEntityId(entityId));
     }
 
+
     private boolean isFullNameEntityId(String entityId) {
         return entityId.contains("#") || entityId.contains("/");
     }

diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/registry/ResourceRegistry.java b/s-pipes-core/src/main/java/cz/cvut/spipes/registry/ResourceRegistry.java
@@ -21,4 +21,6 @@ public interface ResourceRegistry {
 
 
     @NotNull String getResourceUri(@NotNull String entityId) throws ResourceNotFoundException, ResourceNotUniqueException;
+
+    @NotNull boolean doesContextContainsEntity(@NotNull String entityId);
 }
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
@@ -221,10 +221,10 @@ private Model runModule(final Model inputDataModel, final MultiValueMap<String,
         ExecutionEngine engine = createExecutionEngine(configModel);
         ContextLoaderHelper.updateContextsIfNecessary(scriptManager);
         Module module = null;
-        try {
+        if (scriptManager.doesRegistryContainsEntity(id)) {
             module = scriptManager.loadModule(id, null, null);
         }
-        catch (Exception e) {
+        else {
             module = PipelineFactory.loadModule(configModel.createResource(id));
         }
         if (module == null) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,6 @@ public interface ResourceRegistry {


		@NotNull String getResourceUri(@NotNull String entityId) throws ResourceNotFoundException, ResourceNotUniqueException;

		@NotNull boolean doesContextContainsEntity(@NotNull String entityId);
		}