no matcher needed for [elton clean]

globalbioticinteractions · Mar 12, 2024 · 2a47070 · 2a47070
1 parent 330081f
commit 2a47070
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/nomer/src/main/java/org/globalbioticinteractions/nomer/cmd/CmdClean.java b/nomer/src/main/java/org/globalbioticinteractions/nomer/cmd/CmdClean.java
@@ -1,20 +1,22 @@
 package org.globalbioticinteractions.nomer.cmd;
 
 import org.apache.commons.io.FileUtils;
+import org.globalbioticinteractions.nomer.match.TermMatcherContextCaching;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 import java.io.File;
 
 @CommandLine.Command(name = "clean", description = "Cleans term matcher cache.")
-public class CmdClean extends CmdMatcherParams {
+public class CmdClean implements Runnable {
     private final static Logger LOG = LoggerFactory.getLogger(CmdClean.class);
 
     @Override
     public void run() {
-        LOG.info("cleaning cache at [" + getCacheDir() + "]...");
-        FileUtils.deleteQuietly(new File(getCacheDir()));
-        LOG.info("cleaning cache at [" + getCacheDir() + "] done.");
+        File cacheDir = TermMatcherContextCaching.getOrCreateDefaultCacheDir();
+        LOG.info("cleaning cache at [" + cacheDir.getAbsolutePath() + "]...");
+        FileUtils.deleteQuietly(cacheDir);
+        LOG.info("cleaning cache at [" + cacheDir.getAbsolutePath() + "] done.");
     }
 }
diff --git a/nomer/src/main/java/org/globalbioticinteractions/nomer/cmd/CmdMatcherParams.java b/nomer/src/main/java/org/globalbioticinteractions/nomer/cmd/CmdMatcherParams.java
@@ -31,14 +31,6 @@ public List<String> getMatchers() {
         return matchers;
     }
 
-    @Override
-    public String getCacheDir() {
-        String property = getProperty("nomer.cache.dir");
-        File cacheDir = StringUtils.isBlank(property)
-                ? getOrCreateDefaultCacheDir()
-                : getOrCreateCacheDir(new File(property));
-        return cacheDir.getAbsolutePath();
-    }
 
     @Override
     public Map<Integer, String> getInputSchema() {
@@ -73,20 +65,5 @@ public static Map<Integer, String> parseSchema(String schema) {
                 : schemaMap);
     }
 
-    public static File getOrCreateDefaultCacheDir() {
-        File userHome = new File(System.getProperty("user.home"));
-        return getOrCreateCacheDir(new File(userHome, ".cache/nomer"));
-    }
-
-    private static File getOrCreateCacheDir(File cacheDir) {
-        if (!cacheDir.exists()) {
-            try {
-                FileUtils.forceMkdir(cacheDir);
-            } catch (IOException ex) {
-                throw new IllegalArgumentException("invalid or missing cachedir [" + cacheDir.getAbsolutePath() + "]");
-            }
-        }
-        return cacheDir;
-    }
 
 }
diff --git a/nomer/src/main/java/org/globalbioticinteractions/nomer/match/TermMatcherContextCaching.java b/nomer/src/main/java/org/globalbioticinteractions/nomer/match/TermMatcherContextCaching.java
@@ -1,8 +1,11 @@
 package org.globalbioticinteractions.nomer.match;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.globalbioticinteractions.nomer.cmd.CmdDefaultParams;
 import org.globalbioticinteractions.nomer.util.TermMatcherContext;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -16,4 +19,33 @@ public InputStream retrieve(URI uri) throws IOException {
                 .retrieve(uri);
     }
 
+    @Override
+    public String getCacheDir() {
+        return getOrCreateCacheDir();
+    }
+
+    private String getOrCreateCacheDir() {
+        String property = getProperty("nomer.cache.dir");
+        File cacheDir = StringUtils.isBlank(property)
+                ? getOrCreateDefaultCacheDir()
+                : getOrCreateCacheDir(new File(property));
+        return cacheDir.getAbsolutePath();
+    }
+
+    public static File getOrCreateDefaultCacheDir() {
+        File userHome = new File(System.getProperty("user.home"));
+        return getOrCreateCacheDir(new File(userHome, ".cache/nomer"));
+    }
+
+    private static File getOrCreateCacheDir(File cacheDir) {
+        if (!cacheDir.exists()) {
+            try {
+                FileUtils.forceMkdir(cacheDir);
+            } catch (IOException ex) {
+                throw new IllegalArgumentException("invalid or missing cachedir [" + cacheDir.getAbsolutePath() + "]");
+            }
+        }
+        return cacheDir;
+    }
+
 }