Server: proxying

dhfs-parent/autoprotomap/integration-tests/pom.xml

@@ -82,7 +82,7 @@
 
     <profiles>
         <profile>
-            <id>native-image</id>
+            <id>native</id>
             <activation>
                 <property>
                     <name>native</name>

dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java

@@ -1,10 +0,0 @@
-package com.usatiuk.dhfs.objects.transaction;
-
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-
-import java.util.Optional;
-
-public interface TransactionObject<T extends JData> {
-    Optional<JDataVersionedWrapper> data();
-}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JData.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import java.io.Serializable;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapper.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 public interface JDataVersionedWrapper {
     JData data();

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperImpl.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import jakarta.annotation.Nonnull;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperLazy.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import java.util.function.Supplier;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperSerializer.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 
 import com.google.protobuf.ByteString;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 
 import com.google.protobuf.ByteString;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/ObjectSerializer.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import com.google.protobuf.ByteString;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Data.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import java.util.Optional;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IterProdFn.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 @FunctionalInterface
 public interface IterProdFn<K extends Comparable<K>, V> {

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IteratorStart.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 public enum IteratorStart {
     LT,

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/KeyPredicateKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MappingKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MaybeTombstone.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import java.util.Optional;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MergingKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/NavigableMapKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/PredicateKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversedKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversibleKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Tombstone.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import java.util.Optional;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/TombstoneMergingKvIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
-import com.usatiuk.dhfs.objects.iterators.IteratorStart;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
 import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 
 import javax.annotation.Nonnull;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntry.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
 public interface SnapshotEntry {
     long whenToRemove();

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryDeleted.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
 public record SnapshotEntryDeleted(long whenToRemove) implements SnapshotEntry {
     @Override

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryObject.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JDataVersionedWrapper;
 
 public record SnapshotEntryObject(JDataVersionedWrapper data, long whenToRemove) implements SnapshotEntry {
     @Override

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotKey.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JObjectKey;
 
 import javax.annotation.Nonnull;
 import java.util.Comparator;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotKvIterator.java

@@ -1,8 +1,9 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.*;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.iterators.*;
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotManager.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.stores.WritebackObjectPersistentStore;
-import com.usatiuk.dhfs.objects.transaction.TxRecord;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.stores.WritebackObjectPersistentStore;
+import com.usatiuk.objects.transaction.TxRecord;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/CachingObjectPersistentStore.java

@@ -1,10 +1,11 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.*;
-import com.usatiuk.dhfs.objects.snapshot.Snapshot;
-import com.usatiuk.dhfs.objects.transaction.LockManager;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.snapshot.Snapshot;
+import com.usatiuk.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/objects/stores/LmdbObjectPersistentStore.java

@@ -1,12 +1,12 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
-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.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.iterators.KeyPredicateKvIterator;
+import com.usatiuk.objects.iterators.ReversibleKvIterator;
+import com.usatiuk.objects.snapshot.Snapshot;
 import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
 import com.usatiuk.dhfs.utils.RefcountedCloseable;
 import io.quarkus.arc.properties.IfBuildProperty;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/MemoryObjectPersistentStore.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
-import com.usatiuk.dhfs.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.objects.iterators.NavigableMapKvIterator;
-import com.usatiuk.dhfs.objects.snapshot.Snapshot;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.iterators.NavigableMapKvIterator;
+import com.usatiuk.objects.snapshot.Snapshot;
 import io.quarkus.arc.properties.IfBuildProperty;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.pcollections.TreePMap;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/ObjectPersistentStore.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;
-import com.usatiuk.dhfs.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.objects.snapshot.Snapshot;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.snapshot.Snapshot;
 
 import javax.annotation.Nonnull;
 import java.util.Optional;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingDelete.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JObjectKey;
 
 public record PendingDelete(JObjectKey key, long bundleId) implements PendingWriteEntry {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWrite.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JDataVersionedWrapper;
 
 public record PendingWrite(JDataVersionedWrapper data, long bundleId) implements PendingWriteEntry {
 }

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWriteEntry.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 public interface PendingWriteEntry {
     long bundleId();

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java

@@ -1,13 +1,13 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.ObjectSerializer;
-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.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.ObjectSerializer;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.iterators.MappingKvIterator;
+import com.usatiuk.objects.snapshot.Snapshot;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestObj.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JObjectKey;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.Serializable;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestRaw.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JObjectKey;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.Serializable;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java

@@ -1,12 +1,13 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.objects.stores;
 
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.objects.JDataVersionedWrapperImpl;
-import com.usatiuk.dhfs.objects.JObjectKey;
-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 com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JDataVersionedWrapperImpl;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.snapshot.Snapshot;
+import com.usatiuk.objects.transaction.TxCommitException;
+import com.usatiuk.objects.transaction.TxRecord;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.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 com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.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.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.snapshot.SnapshotManager;
 import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.StartupEvent;
@@ -19,7 +19,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-// Manages all access to com.usatiuk.dhfs.objects.JData objects.
+// Manages all access to com.usatiuk.objects.JData objects.
 // In particular, it serves as a source of truth for what is committed to the backing storage.
 // All data goes through it, it is responsible for transaction atomicity
 // TODO: persistent tx id

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.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/objects/transaction/LockingStrategy.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 public enum LockingStrategy {
     OPTIMISTIC,           // Optimistic write, no blocking other possible writers/readers

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/PreCommitTxHook.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
 
 public interface PreCommitTxHook {
     default void onChange(JObjectKey key, JData old, JData cur) {

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/Transaction.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.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 com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.CloseableKvIterator;
+import com.usatiuk.objects.iterators.IteratorStart;
 
 import java.util.Optional;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactory.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 public interface TransactionFactory {
     TransactionPrivate createTransaction();

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.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.iterators.*;
-import com.usatiuk.dhfs.objects.snapshot.Snapshot;
-import com.usatiuk.dhfs.objects.snapshot.SnapshotManager;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.iterators.*;
+import com.usatiuk.objects.snapshot.Snapshot;
+import com.usatiuk.objects.snapshot.SnapshotManager;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandle.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 public interface TransactionHandle {
     void onFlush(Runnable runnable);

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandlePrivate.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 import java.util.Collection;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 import com.usatiuk.dhfs.utils.VoidFn;
 import io.quarkus.logging.Log;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObject.java

@@ -0,0 +1,10 @@
+package com.usatiuk.objects.transaction;
+
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
+
+import java.util.Optional;
+
+public interface TransactionObject<T extends JData> {
+    Optional<JDataVersionedWrapper> data();
+}

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 
 import java.util.Optional;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectNoLock.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
 
 import java.util.Optional;
 

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.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.Snapshot;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JDataVersionedWrapper;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.snapshot.Snapshot;
 import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
 
 import java.util.Collection;

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxCommitException.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
 public class TxCommitException extends RuntimeException {
     public TxCommitException(String message) {

dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxRecord.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.transaction;
+package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
 
 public class TxRecord {
     public interface TxObjectRecord<T> {

dhfs-parent/objects/src/main/resources/application.properties

@@ -6,5 +6,5 @@ dhfs.objects.lock_timeout_secs=15
 dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs
 dhfs.objects.persistence.snapshot-extra-checks=false
 dhfs.objects.transaction.never-lock=true
-quarkus.log.category."com.usatiuk.dhfs.objects.iterators".level=INFO
-quarkus.log.category."com.usatiuk.dhfs.objects.iterators".min-level=INFO
+quarkus.log.category."com.usatiuk.objects.iterators".level=INFO
+quarkus.log.category."com.usatiuk.objects.iterators".min-level=INFO

dhfs-parent/objects/src/test/java/com/usatiuk/objects/Just.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import org.junit.jupiter.api.Assertions;
 

dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestExtraChecksTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestImpl.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
-import com.usatiuk.dhfs.objects.data.Parent;
-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.objects.data.Parent;
+import com.usatiuk.objects.iterators.IteratorStart;
+import com.usatiuk.objects.transaction.LockingStrategy;
+import com.usatiuk.objects.transaction.Transaction;
+import com.usatiuk.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/objects/ObjectsTestNoExtraChecksTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;

dhfs-parent/objects/src/test/java/com/usatiuk/objects/PreCommitTxHookTest.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.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 com.usatiuk.objects.data.Parent;
+import com.usatiuk.objects.transaction.PreCommitTxHook;
+import com.usatiuk.objects.transaction.Transaction;
+import com.usatiuk.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/objects/TempDataProfile.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 

dhfs-parent/objects/src/test/java/com/usatiuk/objects/TestDataCleaner.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.objects;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Kid.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.data;
+package com.usatiuk.objects.data;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
 
 public record Kid(JObjectKey key, String name) implements JData {
     public Kid withName(String name) {

dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Parent.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.data;
+package com.usatiuk.objects.data;
 
-import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
 
 public record Parent(JObjectKey key, String name) implements JData {
     public Parent withName(String name) {

dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/KeyPredicateKvIteratorTest.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.objects.Just;
+import com.usatiuk.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/objects/iterators/MergingKvIteratorTest.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.objects.Just;
+import com.usatiuk.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/objects/iterators/NavigableMapKvIteratorTest.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.objects.Just;
+import com.usatiuk.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/objects/iterators/PredicateKvIteratorTest.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.iterators;
+package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.objects.Just;
+import com.usatiuk.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/objects/snapshot/SnapshotKvIteratorTest.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.snapshot;
+package com.usatiuk.objects.snapshot;
 
 public class SnapshotKvIteratorTest {
 

dhfs-parent/objects/src/test/java/com/usatiuk/objects/stores/LmdbKvIteratorTest.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.stores;
+package com.usatiuk.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 com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.Just;
+import com.usatiuk.objects.TempDataProfile;
+import com.usatiuk.objects.iterators.IteratorStart;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 import jakarta.inject.Inject;

dhfs-parent/pom.xml

@@ -29,7 +29,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.15.2</quarkus.platform.version>
+        <quarkus.platform.version>3.20.0</quarkus.platform.version>
         <surefire-plugin.version>3.5.2</surefire-plugin.version>
         <dhfs.native-libs-dir>${project.parent.build.outputDirectory}/native</dhfs.native-libs-dir>
     </properties>

dhfs-parent/server/pom.xml

@@ -37,12 +37,10 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.78.1</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
-            <version>1.78.1</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ConflictResolver.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 public interface ConflictResolver {
     void resolve(PeerId fromPeer, RemoteObjectMeta ours, RemoteObjectMeta theirs);

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java

@@ -1,7 +1,9 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
-import com.usatiuk.dhfs.objects.transaction.Transaction;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.transaction.PreCommitTxHook;
+import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.jmap.JMapRef;
+import com.usatiuk.dhfs.jmap.JMapRef;
+import com.usatiuk.objects.JObjectKey;
 
 public record JDataNormalRef(JObjectKey obj) implements JDataRef {
     @Override

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java

@@ -1,4 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
+
+import com.usatiuk.objects.JObjectKey;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java

@@ -1,5 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
 import org.pcollections.PCollection;
 
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 import java.io.Serializable;
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java

@@ -1,7 +1,8 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import jakarta.inject.Singleton;
 
 @Singleton

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java

@@ -1,4 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
+
+import com.usatiuk.objects.JObjectKey;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ReceivedObject.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 import org.pcollections.PMap;
 
 public record ReceivedObject(PMap<PeerId, Long> changelog, JDataRemoteDto data) {

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java

@@ -1,7 +1,9 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
-import com.usatiuk.dhfs.objects.transaction.Transaction;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.objects.transaction.PreCommitTxHook;
+import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java

@@ -1,9 +1,11 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-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 com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
+import com.usatiuk.objects.JData;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.objects.transaction.PreCommitTxHook;
+import com.usatiuk.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java

@@ -1,5 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.objects.JObjectKey;
 import org.pcollections.HashTreePSet;
 import org.pcollections.PCollection;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java

@@ -1,11 +1,12 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.AutosyncProcessor;
-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.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.AutosyncProcessor;
+import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.objects.transaction.Transaction;
+import com.usatiuk.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/RemoteObjectMeta.java

@@ -1,5 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.objects.JObjectKey;
 import org.pcollections.*;
 
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java

@@ -1,10 +1,11 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.objects.repository.SyncHandler;
-import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
-import com.usatiuk.dhfs.objects.transaction.Transaction;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.repository.SyncHandler;
+import com.usatiuk.objects.transaction.LockingStrategy;
+import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.repository.OpP;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
+import com.usatiuk.dhfs.repository.OpP;
+import com.usatiuk.dhfs.repository.invalidation.Op;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java

@@ -1,9 +1,9 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JDataRemote;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto {
     @Override

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java

@@ -1,9 +1,9 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.persistence.ChunkDataP;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.persistence.ChunkDataP;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import jakarta.inject.Singleton;
 
 @Singleton

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java

@@ -1,10 +1,10 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.JDataRemote;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.jmap.JMapHolder;
-import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.jmap.JMapHolder;
+import com.usatiuk.dhfs.jmap.JMapLongKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 import java.util.Collection;
 import java.util.Set;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java

@@ -1,8 +1,8 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.JDataRemote;
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.List;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java

@@ -1,7 +1,7 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapper;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.repository.syncmap.DtoMapper;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java

@@ -1,8 +1,8 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
+import com.usatiuk.objects.JObjectKey;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.jmap.JMapLongKey;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;