Objects: a bunch of moving around

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;

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;
 

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

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,

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;

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;
 

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;
 

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;
 

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.*;

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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

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;

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.iterators.IteratorStart;
-import com.usatiuk.dhfs.objects.ReversibleKvIterator;
+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;

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.iterators.CloseableKvIterator;
-import com.usatiuk.dhfs.objects.IterProdFn;
 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;
 

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.iterators.CloseableKvIterator;
-import com.usatiuk.dhfs.objects.IterProdFn;
 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;
 

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 {
 }

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 {
 }

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();

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;
 

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;

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;

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.*;
-import com.usatiuk.dhfs.objects.persistence.IteratorStart;
+import com.usatiuk.dhfs.objects.iterators.*;
-import com.usatiuk.dhfs.objects.persistence.TxManifestObj;
 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;

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.JData;
-import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
+import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.transaction.Transaction;
+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

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;

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;

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) {

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;
 

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

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;
 

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;

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;

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;
 

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) {

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
+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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;