diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CloseableKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java similarity index 91% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CloseableKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java index 7014f8a2..6dc5dc9c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CloseableKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Data.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java similarity index 80% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Data.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java index b1f7bcb7..b036d366 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Data.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/IterProdFn.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java similarity index 74% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/IterProdFn.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java index f39ad962..6198dcd9 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/IterProdFn.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; @FunctionalInterface diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/IteratorStart.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java similarity index 57% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/IteratorStart.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java index 338c025f..f63a2a3a 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/IteratorStart.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.iterators; public enum IteratorStart { LT, diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/KeyPredicateKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/KeyPredicateKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java index b43308d2..97a8058a 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/KeyPredicateKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import org.apache.commons.lang3.tuple.Pair; import java.util.NoSuchElementException; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MappingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MappingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java index eae8f788..db3322c0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MappingKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MaybeTombstone.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java similarity index 67% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MaybeTombstone.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java index f6d47c71..0a39c3c3 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MaybeTombstone.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MergingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java similarity index 99% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MergingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java index af9684e4..54a15071 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/MergingKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import io.quarkus.logging.Log; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/NavigableMapKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/NavigableMapKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java index c1f07007..149a9a27 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/NavigableMapKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import org.apache.commons.lang3.tuple.Pair; import java.util.*; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PredicateKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PredicateKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java index a39bfad4..5492b2de 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PredicateKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import io.quarkus.logging.Log; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversedKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversedKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java index 88b23f30..b152334b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversedKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversibleKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversibleKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java index a13a063d..b1c0f400 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ReversibleKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Tombstone.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java similarity index 79% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Tombstone.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java index 62a7ca1c..17618a15 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/Tombstone.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TombstoneMergingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java similarity index 95% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TombstoneMergingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java index e8e01e27..3f2fce7c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TombstoneMergingKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java @@ -1,6 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; import io.quarkus.logging.Log; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java index 718e7413..83be4e2c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs.objects.snapshot; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; -import io.quarkus.logging.Log; import javax.annotation.Nonnull; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java index f4db3043..c63a1b61 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java @@ -1,7 +1,8 @@ package com.usatiuk.dhfs.objects.snapshot; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.*; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import io.quarkus.logging.Log; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java index 203cbe90..b925cb42 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java @@ -1,21 +1,13 @@ package com.usatiuk.dhfs.objects.snapshot; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.stores.WritebackObjectPersistentStore; import com.usatiuk.dhfs.objects.transaction.TxRecord; -import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; -import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang3.mutable.MutableObject; -import org.apache.commons.lang3.tuple.Pair; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.pcollections.TreePMap; import javax.annotation.Nonnull; -import java.lang.ref.Cleaner; import java.util.*; -import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Consumer; @ApplicationScoped diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/CachingObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/CachingObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java index b52fe6bc..34ef5602 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/CachingObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java @@ -1,7 +1,9 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.usatiuk.dhfs.objects.*; +import com.usatiuk.dhfs.objects.iterators.*; import com.usatiuk.dhfs.objects.snapshot.Snapshot; +import com.usatiuk.dhfs.objects.transaction.LockManager; import io.quarkus.logging.Log; import io.quarkus.runtime.Startup; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/LmdbObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/LmdbObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java index 0c50979c..391f7587 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/LmdbObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java @@ -1,10 +1,11 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; -import com.usatiuk.dhfs.objects.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.KeyPredicateKvIterator; -import com.usatiuk.dhfs.objects.ReversibleKvIterator; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.KeyPredicateKvIterator; +import com.usatiuk.dhfs.objects.iterators.ReversibleKvIterator; import com.usatiuk.dhfs.objects.snapshot.Snapshot; import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer; import com.usatiuk.dhfs.utils.RefcountedCloseable; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java similarity index 92% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java index 61e1c638..7a262202 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java @@ -1,19 +1,17 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; -import com.usatiuk.dhfs.objects.CloseableKvIterator; -import com.usatiuk.dhfs.objects.IterProdFn; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.NavigableMapKvIterator; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.NavigableMapKvIterator; import com.usatiuk.dhfs.objects.snapshot.Snapshot; import io.quarkus.arc.properties.IfBuildProperty; import jakarta.enterprise.context.ApplicationScoped; import org.pcollections.TreePMap; import javax.annotation.Nonnull; -import java.util.Collection; import java.util.Optional; -import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Consumer; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java similarity index 87% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java index 58c47587..c25e3c84 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java @@ -1,13 +1,12 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; -import com.usatiuk.dhfs.objects.CloseableKvIterator; -import com.usatiuk.dhfs.objects.IterProdFn; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.snapshot.Snapshot; import javax.annotation.Nonnull; -import java.util.Collection; import java.util.Optional; import java.util.function.Consumer; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingDelete.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java similarity index 51% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingDelete.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java index 8ecc85b5..235e8c99 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingDelete.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java @@ -1,4 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.stores; + +import com.usatiuk.dhfs.objects.JObjectKey; public record PendingDelete(JObjectKey key, long bundleId) implements PendingWriteEntry { } diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWrite.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java similarity index 51% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWrite.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java index 065224f6..a320009d 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWrite.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java @@ -1,4 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.stores; + +import com.usatiuk.dhfs.objects.JDataVersionedWrapper; public record PendingWrite(JDataVersionedWrapper data, long bundleId) implements PendingWriteEntry { } diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWriteEntry.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java similarity index 59% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWriteEntry.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java index 1476e167..732bb3db 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PendingWriteEntry.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.stores; public interface PendingWriteEntry { long bundleId(); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/SerializingObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java similarity index 90% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/SerializingObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java index a0ba0a3c..db7466d3 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/SerializingObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java @@ -1,19 +1,16 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.objects.*; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.MappingKvIterator; import com.usatiuk.dhfs.objects.snapshot.Snapshot; -import com.usatiuk.dhfs.utils.RefcountedCloseable; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; -import org.lmdbjava.Txn; import javax.annotation.Nonnull; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; import java.util.Optional; import java.util.function.Consumer; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestObj.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java similarity index 87% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestObj.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java index 19bc6e36..6e65f5b5 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestObj.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.usatiuk.dhfs.objects.JObjectKey; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestRaw.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java similarity index 89% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestRaw.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java index fd7ec742..93309415 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifestRaw.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.objects.JObjectKey; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/WritebackObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/WritebackObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java index def86174..8c532776 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/WritebackObjectPersistentStore.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.stores; -import com.usatiuk.dhfs.objects.persistence.CachingObjectPersistentStore; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; -import com.usatiuk.dhfs.objects.persistence.TxManifestObj; +import com.usatiuk.dhfs.objects.*; +import com.usatiuk.dhfs.objects.iterators.*; import com.usatiuk.dhfs.objects.snapshot.Snapshot; +import com.usatiuk.dhfs.objects.transaction.TxCommitException; import com.usatiuk.dhfs.objects.transaction.TxRecord; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java similarity index 76% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java index b2eb2d33..2988cdcb 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java @@ -1,15 +1,12 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; -import com.usatiuk.dhfs.objects.transaction.LockingStrategy; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nonnull; -import java.util.Collection; -import java.util.Iterator; import java.util.Optional; @ApplicationScoped diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java index 36f633f8..2310a6f5 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java @@ -1,7 +1,9 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JDataVersionedWrapper; +import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.snapshot.SnapshotManager; -import com.usatiuk.dhfs.objects.transaction.*; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; import io.quarkus.logging.Log; import io.quarkus.runtime.StartupEvent; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/LockManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java similarity index 86% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/LockManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java index 8bb20802..ad950fd0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/LockManager.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java @@ -1,5 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; +import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; import com.usatiuk.dhfs.utils.DataLocker; import jakarta.annotation.Nonnull; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java similarity index 69% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java index 3b1b50e4..bb933779 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/PreCommitTxHook.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java @@ -1,4 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; + +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; public interface PreCommitTxHook { default void onChange(JObjectKey key, JData old, JData cur) { diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java index b2c9e860..055cbe9e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java index 31c2ac77..3aecbccf 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java @@ -1,7 +1,8 @@ package com.usatiuk.dhfs.objects.transaction; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.*; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.snapshot.Snapshot; import com.usatiuk.dhfs.objects.snapshot.SnapshotManager; import io.quarkus.logging.Log; @@ -9,7 +10,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nonnull; import java.util.*; @ApplicationScoped diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java similarity index 94% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java index 2fe54390..313588a2 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManager.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java @@ -1,7 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionHandle; import com.usatiuk.dhfs.utils.VoidFn; import io.quarkus.logging.Log; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManagerImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java similarity index 89% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManagerImpl.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java index bf617e19..6727c8b6 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManagerImpl.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java @@ -1,8 +1,5 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionHandle; -import com.usatiuk.dhfs.objects.transaction.TransactionPrivate; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectLocked.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java similarity index 64% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectLocked.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java index ac3a856c..333ac63d 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectLocked.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java @@ -1,6 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionObject; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JDataVersionedWrapper; import com.usatiuk.dhfs.utils.AutoCloseableNoThrow; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectNoLock.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java similarity index 55% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectNoLock.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java index 7672d09a..1260cb4c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionObjectNoLock.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java @@ -1,6 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionObject; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JDataVersionedWrapper; import java.util.Optional; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxCommitException.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java similarity index 83% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxCommitException.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java index 73e488d6..130c15b0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxCommitException.java +++ b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.transaction; public class TxCommitException extends RuntimeException { public TxCommitException(String message) { diff --git a/dhfs-parent/objects/src/main/resources/application.properties b/dhfs-parent/objects/src/main/resources/application.properties index 71d81280..88d1761d 100644 --- a/dhfs-parent/objects/src/main/resources/application.properties +++ b/dhfs-parent/objects/src/main/resources/application.properties @@ -5,4 +5,6 @@ dhfs.objects.lru.print-stats=true dhfs.objects.lock_timeout_secs=15 dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs quarkus.package.jar.decompiler.enabled=true -dhfs.objects.persistence.snapshot-extra-checks=false \ No newline at end of file +dhfs.objects.persistence.snapshot-extra-checks=false +quarkus.log.category."com.usatiuk.dhfs.objects.iterators".level=INFO +quarkus.log.category."com.usatiuk.dhfs.objects.iterators".min-level=INFO diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java index 32a9ea31..80d03674 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java @@ -1,9 +1,10 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.data.Parent; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.quarkus.logging.Log; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java index 1bae7b0a..bcee0138 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java @@ -1,7 +1,9 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.data.Parent; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import io.quarkus.test.junit.mockito.InjectSpy; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/KeyPredicateKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/KeyPredicateKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java index 055f4f29..4ebc7d41 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/KeyPredicateKvIteratorTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.Just; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/MergingKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java similarity index 99% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/MergingKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java index 430dc635..82b7dc00 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/MergingKvIteratorTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.Just; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/NavigableMapKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java similarity index 97% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/NavigableMapKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java index de7a5666..ae99d477 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/NavigableMapKvIteratorTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.Just; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PredicateKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PredicateKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java index 05ad6d4b..1aabb784 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PredicateKvIteratorTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs.objects.iterators; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.Just; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/persistence/LmdbKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/persistence/LmdbKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java index 483297ef..82cd81ed 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/persistence/LmdbKvIteratorTest.java +++ b/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java @@ -1,10 +1,11 @@ -package com.usatiuk.dhfs.objects.persistence; +package com.usatiuk.dhfs.objects.stores; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.Just; import com.usatiuk.dhfs.objects.TempDataProfile; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java index 4fb5969d..b3cd25dd 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java @@ -13,9 +13,10 @@ import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFil import com.usatiuk.dhfs.objects.jmap.JMapEntry; import com.usatiuk.dhfs.objects.jmap.JMapHelper; import com.usatiuk.dhfs.objects.jmap.JMapLongKey; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.transaction.LockingStrategy; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.utils.StatusRuntimeExceptionNoStacktrace; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java index 6910cb1a..0a32966d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java @@ -1,5 +1,6 @@ package com.usatiuk.dhfs.objects; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java index 5d67cc1b..32b1498c 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java @@ -1,5 +1,6 @@ package com.usatiuk.dhfs.objects; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java index 47100484..cdfa2dab 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java @@ -2,6 +2,7 @@ package com.usatiuk.dhfs.objects; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData; import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java index 7c7730f7..a6674f62 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java @@ -4,6 +4,7 @@ import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient; import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java index 4b987791..bbf6a537 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.jkleppmanntree; import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java index a777cb91..c3a4417a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java @@ -1,8 +1,8 @@ package com.usatiuk.dhfs.objects.jmap; -import com.usatiuk.dhfs.objects.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java index 6794d271..b193d00b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java @@ -1,7 +1,8 @@ package com.usatiuk.dhfs.objects.jmap; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java index 15ee4094..47d77636 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.objects.jmap; -import com.usatiuk.dhfs.objects.CloseableKvIterator; +import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; import org.apache.commons.lang3.NotImplementedException; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java index 27e9b186..42d75c4d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java @@ -1,6 +1,7 @@ package com.usatiuk.dhfs.objects.jmap; import com.usatiuk.dhfs.objects.*; +import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java index 824d07b5..81945037 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.repository; import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress; import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory; import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java index cf3b3de3..b925a066 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.objects.repository; import com.usatiuk.dhfs.ShutdownChecker; import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager; import com.usatiuk.dhfs.objects.transaction.Transaction; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java index 56135ef5..c0a74857 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java @@ -6,6 +6,7 @@ import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.objects.repository.invalidation.Op; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java index 466df67d..5f3017f8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java @@ -7,6 +7,7 @@ import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService import com.usatiuk.dhfs.objects.repository.invalidation.Op; import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.quarkus.grpc.GrpcService; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java index 25c6d603..4c006b97 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java @@ -1,9 +1,10 @@ package com.usatiuk.dhfs.objects.repository; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.IteratorStart; +import com.usatiuk.dhfs.objects.iterators.IteratorStart; import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java index 741026f9..c3eb9776 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java @@ -7,7 +7,6 @@ import com.usatiuk.dhfs.objects.ReceivedObject; import com.usatiuk.dhfs.objects.persistence.JDataRemoteP; import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; import com.usatiuk.dhfs.objects.persistence.PeerIdP; -import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Singleton; import org.pcollections.HashTreePMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java index d1b39846..f573126c 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.objects.repository.invalidation; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.RemoteObjectMeta; import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData; import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java index 783d391a..c3e8aaa7 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.objects.repository.peersync; import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.PeerId; import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode; import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; diff --git a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java index 6d02c516..6b1aa34d 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java @@ -4,7 +4,7 @@ import com.usatiuk.dhfs.TempDataProfile; import com.usatiuk.dhfs.files.objects.File; import com.usatiuk.dhfs.files.service.DhfsFileService; import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.TransactionManager; +import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.dhfs.objects.transaction.Transaction; import com.usatiuk.kleppmanntree.AlreadyExistsException; import jakarta.inject.Inject;