[#274] Replace the invocation of loadConfiguration() with loadManualC…

…onfiguration() in all methods that use it. Refactor the code.
kbss-cvut · Sep 27, 2024 · b92e542 · b92e542
1 parent 17e56c1
commit b92e542
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 36 deletions.
diff --git a/...module-dataset-discovery/src/main/java/cz/cvut/spipes/modules/DatasetDiscoveryModule.java b/...module-dataset-discovery/src/main/java/cz/cvut/spipes/modules/DatasetDiscoveryModule.java
@@ -35,14 +35,9 @@ public class DatasetDiscoveryModule extends AnnotatedAbstractModule {
 
     private static final String TYPE_URI = KBSS_MODULE.uri + "dataset-discovery-v1";
 
-    private static final Property P_USER_INPUT = getParameter("prp-user-input");
     @Parameter(iri = TYPE_URI + "/" + "prp-user-input", comment = "Keywords query. Keywords are separated by space.")
     private String userInput;
 
-    private static Property getParameter(final String name) {
-        return ResourceFactory.createProperty(TYPE_URI + "/" + name);
-    }
-
     private List<String> getDatasetsForQuery(final String s, final String endpoint) {
         final List<String> datasets = new ArrayList<>();
 

diff --git a/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java b/s-pipes-modules/module-nlp/src/main/java/cz/cvut/spipes/modules/SUTimeModuleNew.java
@@ -48,7 +48,7 @@ public class SUTimeModuleNew extends AnnotatedAbstractModule {
     private static final Property P_PAGE_SIZE = ResourceFactory.createProperty(TYPE_PREFIX + "page-size");
 
     @Parameter(iri = TYPE_PREFIX + "page-size", comment = "Page size. Default value is 10000.")
-    private Integer pageSize = DEFAULT_PAGE_SIZE;
+    private int pageSize = DEFAULT_PAGE_SIZE;
 
     @Parameter(iri = SML.constructQuery,
             comment = "List of construct queries. The module annotates the lexical form of objects of the output statements of these queries.")// TODO - revise comment

diff --git a/...le-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java b/...le-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructAbstractModule.java
@@ -137,23 +137,9 @@ protected String substituteQueryMarkers(int currentIteration, String queryStr) {
         return queryStr;
     }
 
-//    @Override
-//    public void loadConfiguration() {
-//
-//        // TODO sparql expressions
-//        // TODO load default values from configuration
-//
-//        // TODO does not work with string query as object is not RDF resource ???
-//        constructQueries = getResourcesByProperty(SML.JENA.constructQuery);
-//
-//        log.debug("Loaded {} spin construct queries.", constructQueries.size());
-//
-//        //TODO default value must be taken from template definition
-//        isReplace = this.getPropertyValue(SML.JENA.replace, false);
-//
-//        parseText = this.getPropertyValue(KBSS_MODULE.JENA.is_parse_text, true);
-//        iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.has_max_iteration_count, -1);
-//    }
-
+    @Override
+    public void loadManualConfiguration(){
+        log.debug("Loaded {} spin construct queries.", constructQueries.size());
+    }
 
 }
diff --git a/...s/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructV2Module.java b/...s/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructV2Module.java
@@ -21,7 +21,7 @@ public String getTypeURI() {
 
     @Override
     public void loadManualConfiguration() {
-        super.loadConfiguration();
+        super.loadManualConfiguration();
         iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.has_max_iteration_count, 1);
     }
 }
diff --git a/...java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java b/...java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesAndScrollableCursorModule.java
@@ -107,7 +107,6 @@ protected String substituteQueryMarkers(int currentIteration, String queryStr) {
 
     @Override
     public void loadManualConfiguration() {
-        super.loadConfiguration();
         super.loadManualConfiguration();
         //iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.s_max_iteration_count, 1);
     }

diff --git a/...-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java b/...-endpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithChunkedValuesModule.java
@@ -114,7 +114,7 @@ protected String substituteQueryMarkers(int currentIteration, String queryStr) {
 
     @Override
     public void loadManualConfiguration() {
-        super.loadConfiguration();
+        super.loadManualConfiguration();
         //iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.s_max_iteration_count, 1);
     }
 

diff --git a/...dpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithScrollableCursorModule.java b/...dpoint/src/main/java/cz/cvut/spipes/modules/ApplyConstructWithScrollableCursorModule.java
@@ -77,7 +77,7 @@ protected String substituteQueryMarkers(int currentIteration, String queryStr) {
 
     @Override
     public void loadManualConfiguration() {
-        super.loadConfiguration();
+        super.loadManualConfiguration();
         //iterationCount = this.getPropertyValue(KBSS_MODULE.JENA.s_max_iteration_count, 1);
     }
 }
diff --git a/...ules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/DownloadGraphModule.java b/...ules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/DownloadGraphModule.java
@@ -40,7 +40,7 @@ public class DownloadGraphModule extends AnnotatedAbstractModule {
     private String outputResourceVariable;
 
     @Parameter(iri = TYPE_PREFIX + "page-size", comment = "Page size. Default value is 10000.")
-    private Integer pageSize = DEFAULT_PAGE_SIZE;
+    private int pageSize = DEFAULT_PAGE_SIZE;
 
     protected long numberOfDownloadedTriples;
 

diff --git a/...e-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ImproveSPOWithMarginalsModule.java b/...e-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/ImproveSPOWithMarginalsModule.java
@@ -381,7 +381,7 @@ public String getTypeURI() {
 
     @Override
     public void loadManualConfiguration() {
-        super.loadConfiguration();
+        super.loadManualConfiguration();
     }
 
     private @NotNull

diff --git a/...ules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/RetrieveGraphModule.java b/...ules/module-sparql-endpoint/src/main/java/cz/cvut/spipes/modules/RetrieveGraphModule.java
@@ -31,7 +31,7 @@ public class RetrieveGraphModule extends AnnotatedAbstractModule {
     private String endpointUrl;
 
     @Parameter(iri = TYPE_PREFIX + "page-size", comment = "Page size. Default is 10000.")
-    private Integer pageSize = DEFAULT_PAGE_SIZE;
+    private int pageSize = DEFAULT_PAGE_SIZE;
 
     public String getTypeURI() {
         return TYPE_URI;

diff --git a/...modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java b/...modules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/TextAnalysisModule.java
@@ -186,11 +186,6 @@ private String annotateObjectLiteral(String objectValue) {
         return annotatedText;
     }
 
-    @Override
-    public void loadManualConfiguration() {
-        super.loadConfiguration();
-    }
-
     @Override
     public String getTypeURI() {
         return TYPE_URI;