[Fix] Change data type and default value logic

kbss-cvut · Mar 17, 2022 · 7af9e96 · 7af9e96
1 parent 2b2122c
commit 7af9e96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/manager/OntoDocManager.java b/s-pipes-core/src/main/java/cz/cvut/spipes/manager/OntoDocManager.java
@@ -59,7 +59,7 @@ public class OntoDocManager implements OntologyDocumentManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(OntoDocManager.class);
     private static Instant lastTime = Instant.now();
-    private static Boolean reloadFiles = false;
+    private static boolean reloadFiles = false;
 
     // TODO remove !!!!!!! this is workaround for registering SPIN related things.
     private static Model allLoadedFilesModel = ModelFactory.createDefaultModel();
@@ -395,7 +395,7 @@ public void handleFailedRead(String url, Model model, Exception e) {
         }
     }
 
-    public static void setReloadFiles(Boolean reloadFiles) {
+    public static void setReloadFiles(boolean reloadFiles) {
         OntoDocManager.reloadFiles = reloadFiles;
     }
 }
diff --git a/s-pipes-web/src/main/java/cz/cvut/spipes/rest/util/ContextLoaderHelper.java b/s-pipes-web/src/main/java/cz/cvut/spipes/rest/util/ContextLoaderHelper.java
@@ -21,14 +21,14 @@ public static void updateContextsIfNecessary(SPipesScriptManager scriptManager)
         if (isKeepUpdated()) {
             LOG.warn("Updating contexts which is not thread safe -- don't use in in production environment.");
             OntologyDocumentManager ontoDocManager = OntoDocManager.getInstance();
-            List<String> globalScripts = ContextLoaderHelper.registerGlobalScripts(ontoDocManager, true);
+            List<String> globalScripts = ContextLoaderHelper.registerGlobalScripts(ontoDocManager);
+            OntoDocManager.setReloadFiles(true);
             scriptManager.reloadScripts(globalScripts);
         }
     }
 
-    public static List<String> registerGlobalScripts(OntologyDocumentManager ontDocManager, Boolean reloadFiles) {
+    public static List<String> registerGlobalScripts(OntologyDocumentManager ontDocManager) {
         List<Path> scriptPaths = ContextLoaderConfig.getScriptPaths();
-        OntoDocManager.setReloadFiles(reloadFiles);
         scriptPaths.forEach(
                 ontDocManager::registerDocuments
         );

diff --git a/s-pipes-web/src/main/java/cz/cvut/spipes/rest/util/ScriptManagerFactory.java b/s-pipes-web/src/main/java/cz/cvut/spipes/rest/util/ScriptManagerFactory.java
@@ -14,7 +14,7 @@ public static synchronized SPipesScriptManager getSingletonSPipesScriptManager()
 
         if (scriptManager == null) {
             OntologyDocumentManager ontoDocManager = OntoDocManager.getInstance();
-            List<String> globalScripts = ContextLoaderHelper.registerGlobalScripts(ontoDocManager, false);
+            List<String> globalScripts = ContextLoaderHelper.registerGlobalScripts(ontoDocManager);
             scriptManager = new SPipesScriptManager(ontoDocManager, globalScripts);
         }
         return scriptManager;