[Upd] Refactor naming convention of module parameters

kbss-cvut · Sep 14, 2021 · 2547742 · 2547742
1 parent 5705816
commit 2547742
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 60 deletions.
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/constants/KBSS_MODULE.java b/s-pipes-core/src/main/java/cz/cvut/spipes/constants/KBSS_MODULE.java
@@ -19,6 +19,7 @@ protected static final Property property(String local )
     public static final Property has_debug_mode_flag = property("has-debug-mode-flag");
     public static final Property is_parse_text = property("is-parse-text");
     public static final Property has_max_iteration_count = property("has-max-iteration-count");
+    public static final Property has_resource_uri = property("has-resource-uri");
 
     /**
      returns the URI for this schema

diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/constants/KM_PARAM.java b/s-pipes-core/src/main/java/cz/cvut/spipes/constants/KM_PARAM.java
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/constants/SEMP_LIB.java b/s-pipes-core/src/main/java/cz/cvut/spipes/constants/SEMP_LIB.java
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/exception/ResourceNotFoundException.java b/s-pipes-core/src/main/java/cz/cvut/spipes/exception/ResourceNotFoundException.java
@@ -20,6 +20,10 @@ public ResourceNotFoundException(String entityId, String contextUri) {
         super("Resource identified by \"" + entityId + "\" was not found in context \"" + contextUri + "\".");
     }
 
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
     public ResourceNotFoundException(String message, Throwable cause) {
         super(message, cause);
     }

diff --git a/s-pipes-modules/module-eccairs/src/main/java/cz/cvut/spipes/modules/ImportE5XModule.java b/s-pipes-modules/module-eccairs/src/main/java/cz/cvut/spipes/modules/ImportE5XModule.java
@@ -12,12 +12,12 @@
 import cz.cvut.kbss.jopa.model.descriptors.EntityDescriptor;
 import cz.cvut.kbss.ucl.MappingEccairsData2Aso;
 import cz.cvut.spipes.constants.KBSS_MODULE;
-import cz.cvut.spipes.constants.KM_PARAM;
 import cz.cvut.spipes.engine.ExecutionContext;
 import cz.cvut.spipes.engine.ExecutionContextFactory;
+import cz.cvut.spipes.exception.ResourceNotFoundException;
 import cz.cvut.spipes.modules.eccairs.EccairsAccessFactory;
-import cz.cvut.spipes.modules.eccairs.SesameDataDao;
 import cz.cvut.spipes.modules.eccairs.JopaPersistenceUtils;
+import cz.cvut.spipes.modules.eccairs.SesameDataDao;
 import cz.cvut.spipes.registry.StreamResource;
 import cz.cvut.spipes.registry.StreamResourceRegistry;
 import cz.cvut.spipes.util.JenaUtils;
@@ -29,7 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
 
@@ -144,7 +145,7 @@ public String getTypeURI() {
 
     @Override
     public void loadConfiguration() {
-        String e5xResourceUriStr = getEffectiveValue(KM_PARAM.has_resource_uri).asLiteral().toString();
+        String e5xResourceUriStr = getEffectiveValue(KBSS_MODULE.has_resource_uri).asLiteral().toString();
         e5xResource = getResourceByUri(e5xResourceUriStr);
     }
 
@@ -170,7 +171,7 @@ private StreamResource getResourceByUri(@NotNull String e5xResourceUriStr) {
         StreamResource res = StreamResourceRegistry.getInstance().getResourceByUrl(e5xResourceUriStr);
 
         if (res == null) {
-            throw new RuntimeException("Stream resource " + e5xResourceUriStr + " not found. "); // TODO specific exception
+            throw new ResourceNotFoundException("Stream resource " + e5xResourceUriStr + " not found. ");
         }
         return res;
     }