more into store package

bio-guoda · Jan 9, 2025 · ec6bc47 · ec6bc47
1 parent 3f396f6
commit ec6bc47
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 28 deletions.
diff --git a/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java b/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java
@@ -10,6 +10,7 @@
 import bio.guoda.preston.process.StatementsListener;
 import bio.guoda.preston.store.BlobStore;
 import bio.guoda.preston.store.BlobStoreAppendOnly;
+import bio.guoda.preston.store.KeyToPathFactoryDepth;
 import bio.guoda.preston.store.ValidatingKeyValueStreamContentAddressedFactory;
 import org.apache.commons.rdf.api.IRI;
 import picocli.CommandLine;

diff --git a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactory.java b/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactory.java
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactory.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactory.java
@@ -0,0 +1,5 @@
+package bio.guoda.preston.store;
+
+public interface KeyToPathFactory {
+    KeyToPath getKeyToPath();
+}
diff --git a/...da/preston/cmd/KeyToPathFactoryDepth.java → .../preston/store/KeyToPathFactoryDepth.java b/...da/preston/cmd/KeyToPathFactoryDepth.java → .../preston/store/KeyToPathFactoryDepth.java
@@ -1,8 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyTo1LevelPath;
-import bio.guoda.preston.store.KeyTo3LevelPath;
-import bio.guoda.preston.store.KeyToPath;
+package bio.guoda.preston.store;
 
 import java.net.URI;
 

diff --git a/...oda/preston/cmd/KeyValueStoreFactory.java → ...a/preston/store/KeyValueStoreFactory.java b/...oda/preston/cmd/KeyValueStoreFactory.java → ...a/preston/store/KeyValueStoreFactory.java
@@ -1,7 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyValueStore;
-import bio.guoda.preston.store.ValidatingKeyValueStreamFactory;
+package bio.guoda.preston.store;
 
 public interface KeyValueStoreFactory {
     KeyValueStore getKeyValueStore(ValidatingKeyValueStreamFactory validatingKeyValueStreamFactory);

diff --git a/...ton/cmd/KeyValueStoreFactoryFallBack.java → ...n/store/KeyValueStoreFactoryFallBack.java b/...ton/cmd/KeyValueStoreFactoryFallBack.java → ...n/store/KeyValueStoreFactoryFallBack.java
@@ -1,12 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyTo5LevelPath;
-import bio.guoda.preston.store.KeyToPath;
-import bio.guoda.preston.store.KeyValueStore;
-import bio.guoda.preston.store.KeyValueStoreLocalFileSystem;
-import bio.guoda.preston.store.KeyValueStoreReadOnly;
-import bio.guoda.preston.store.KeyValueStoreWithFallback;
-import bio.guoda.preston.store.ValidatingKeyValueStreamFactory;
+package bio.guoda.preston.store;
 
 import java.io.File;
 

diff --git a/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java
@@ -3,9 +3,6 @@
 import bio.guoda.preston.DerefProgressListener;
 import bio.guoda.preston.HashType;
 import bio.guoda.preston.ResourcesHTTP;
-import bio.guoda.preston.cmd.KeyToPathFactory;
-import bio.guoda.preston.cmd.KeyToPathFactoryDepth;
-import bio.guoda.preston.cmd.KeyValueStoreFactoryFallBack;
 import bio.guoda.preston.stream.ContentStreamUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;