From 8fdbaf5aa77cd555c846baa3a4bc8ce1601050ce Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Thu, 27 Mar 2025 15:41:16 +0100 Subject: [PATCH] Objects: move objects to com.usatiuk.objects --- .../objects/transaction/TransactionObject.java | 10 ---------- .../com/usatiuk/{dhfs => }/objects/JData.java | 2 +- .../objects/JDataVersionedWrapper.java | 2 +- .../objects/JDataVersionedWrapperImpl.java | 2 +- .../objects/JDataVersionedWrapperLazy.java | 2 +- .../JDataVersionedWrapperSerializer.java | 2 +- .../usatiuk/{dhfs => }/objects/JObjectKey.java | 2 +- .../{dhfs => }/objects/JavaDataSerializer.java | 2 +- .../{dhfs => }/objects/ObjectSerializer.java | 2 +- .../objects/iterators/CloseableKvIterator.java | 2 +- .../{dhfs => }/objects/iterators/Data.java | 2 +- .../objects/iterators/IterProdFn.java | 2 +- .../objects/iterators/IteratorStart.java | 2 +- .../iterators/KeyPredicateKvIterator.java | 2 +- .../objects/iterators/MappingKvIterator.java | 2 +- .../objects/iterators/MaybeTombstone.java | 2 +- .../objects/iterators/MergingKvIterator.java | 2 +- .../iterators/NavigableMapKvIterator.java | 2 +- .../objects/iterators/PredicateKvIterator.java | 2 +- .../objects/iterators/ReversedKvIterator.java | 2 +- .../objects/iterators/ReversibleKvIterator.java | 2 +- .../{dhfs => }/objects/iterators/Tombstone.java | 2 +- .../iterators/TombstoneMergingKvIterator.java | 2 +- .../{dhfs => }/objects/snapshot/Snapshot.java | 8 ++++---- .../objects/snapshot/SnapshotEntry.java | 2 +- .../objects/snapshot/SnapshotEntryDeleted.java | 2 +- .../objects/snapshot/SnapshotEntryObject.java | 4 ++-- .../objects/snapshot/SnapshotKey.java | 4 ++-- .../objects/snapshot/SnapshotKvIterator.java | 9 +++++---- .../objects/snapshot/SnapshotManager.java | 10 +++++----- .../stores/CachingObjectPersistentStore.java | 13 +++++++------ .../stores/LmdbObjectPersistentStore.java | 14 +++++++------- .../stores/MemoryObjectPersistentStore.java | 12 ++++++------ .../objects/stores/ObjectPersistentStore.java | 10 +++++----- .../objects/stores/PendingDelete.java | 4 ++-- .../{dhfs => }/objects/stores/PendingWrite.java | 4 ++-- .../objects/stores/PendingWriteEntry.java | 2 +- .../SerializingObjectPersistentStore.java | 16 ++++++++-------- .../objects/stores/TxManifestObj.java | 4 ++-- .../objects/stores/TxManifestRaw.java | 4 ++-- .../stores/WritebackObjectPersistentStore.java | 17 +++++++++-------- .../objects/transaction/CurrentTransaction.java | 10 +++++----- .../objects/transaction/JObjectManager.java | 12 ++++++------ .../objects/transaction/LockManager.java | 4 ++-- .../objects/transaction/LockingStrategy.java | 2 +- .../objects/transaction/PreCommitTxHook.java | 6 +++--- .../objects/transaction/Transaction.java | 10 +++++----- .../objects/transaction/TransactionFactory.java | 2 +- .../transaction/TransactionFactoryImpl.java | 14 +++++++------- .../objects/transaction/TransactionHandle.java | 2 +- .../transaction/TransactionHandlePrivate.java | 2 +- .../objects/transaction/TransactionManager.java | 2 +- .../transaction/TransactionManagerImpl.java | 2 +- .../objects/transaction/TransactionObject.java | 10 ++++++++++ .../transaction/TransactionObjectLocked.java | 6 +++--- .../transaction/TransactionObjectNoLock.java | 6 +++--- .../objects/transaction/TransactionPrivate.java | 10 +++++----- .../objects/transaction/TxCommitException.java | 2 +- .../objects/transaction/TxRecord.java | 6 +++--- .../src/main/resources/application.properties | 4 ++-- .../com/usatiuk/{dhfs => }/objects/Just.java | 2 +- .../objects/ObjectsTestExtraChecksTest.java | 2 +- .../{dhfs => }/objects/ObjectsTestImpl.java | 12 ++++++------ .../objects/ObjectsTestNoExtraChecksTest.java | 2 +- .../{dhfs => }/objects/PreCommitTxHookTest.java | 10 +++++----- .../{dhfs => }/objects/TempDataProfile.java | 2 +- .../{dhfs => }/objects/TestDataCleaner.java | 2 +- .../usatiuk/{dhfs => }/objects/data/Kid.java | 6 +++--- .../usatiuk/{dhfs => }/objects/data/Parent.java | 6 +++--- .../iterators/KeyPredicateKvIteratorTest.java | 4 ++-- .../iterators/MergingKvIteratorTest.java | 4 ++-- .../iterators/NavigableMapKvIteratorTest.java | 4 ++-- .../iterators/PredicateKvIteratorTest.java | 4 ++-- .../snapshot/SnapshotKvIteratorTest.java | 2 +- .../objects/stores/LmdbKvIteratorTest.java | 10 +++++----- .../java/com/usatiuk/dhfs/DeleterTxHook.java | 8 ++++---- .../java/com/usatiuk/dhfs/JDataNormalRef.java | 2 +- .../main/java/com/usatiuk/dhfs/JDataRef.java | 2 +- .../java/com/usatiuk/dhfs/JDataRefcounted.java | 4 ++-- .../main/java/com/usatiuk/dhfs/JDataRemote.java | 2 +- .../usatiuk/dhfs/JObjectKeyProtoSerializer.java | 2 +- .../src/main/java/com/usatiuk/dhfs/PeerId.java | 2 +- .../java/com/usatiuk/dhfs/RefcounterTxHook.java | 8 ++++---- .../com/usatiuk/dhfs/RemoteObjPusherTxHook.java | 8 ++++---- .../usatiuk/dhfs/RemoteObjectDataWrapper.java | 2 +- .../com/usatiuk/dhfs/RemoteObjectDeleter.java | 6 +++--- .../java/com/usatiuk/dhfs/RemoteObjectMeta.java | 2 +- .../com/usatiuk/dhfs/RemoteTransaction.java | 6 +++--- .../usatiuk/dhfs/files/objects/ChunkData.java | 2 +- .../files/objects/ChunkDataProtoSerializer.java | 2 +- .../com/usatiuk/dhfs/files/objects/File.java | 2 +- .../com/usatiuk/dhfs/files/objects/FileDto.java | 2 +- .../usatiuk/dhfs/files/objects/FileHelper.java | 2 +- .../dhfs/files/objects/FileSyncHandler.java | 6 +++--- .../dhfs/files/service/DhfsFileService.java | 2 +- .../dhfs/files/service/DhfsFileServiceImpl.java | 11 ++++++----- .../JKleppmannTreeInitialSyncProcessor.java | 2 +- .../jkleppmanntree/JKleppmannTreeManager.java | 8 ++++---- .../jkleppmanntree/JKleppmannTreeOpWrapper.java | 2 +- .../JKleppmannTreePeriodicPushOp.java | 2 +- .../structs/JKleppmannTreeNode.java | 2 +- .../structs/JKleppmannTreeNodeMetaFile.java | 2 +- .../structs/JKleppmannTreePersistentData.java | 2 +- .../java/com/usatiuk/dhfs/jmap/JMapEntry.java | 4 ++-- .../java/com/usatiuk/dhfs/jmap/JMapHelper.java | 8 ++++---- .../java/com/usatiuk/dhfs/jmap/JMapHolder.java | 2 +- .../dhfs/jmap/JMapHolderRefcounterTxHook.java | 7 ++++--- .../com/usatiuk/dhfs/jmap/JMapIterator.java | 6 +++--- .../java/com/usatiuk/dhfs/jmap/JMapRef.java | 2 +- .../usatiuk/dhfs/jmap/JMapRefcounterTxHook.java | 8 ++++---- .../dhfs/repository/AutosyncProcessor.java | 9 +++++---- .../usatiuk/dhfs/repository/AutosyncTxHook.java | 8 ++++---- .../dhfs/repository/DefaultObjSyncHandler.java | 4 ++-- .../dhfs/repository/InitialSyncProcessor.java | 4 ++-- .../usatiuk/dhfs/repository/ObjSyncHandler.java | 2 +- .../usatiuk/dhfs/repository/PeerManager.java | 4 ++-- .../repository/PersistentPeerDataService.java | 4 ++-- .../repository/PersistentRemoteHostsData.java | 4 ++-- .../repository/RemoteObjectServiceClient.java | 6 +++--- .../RemoteObjectServiceServerImpl.java | 6 +++--- .../usatiuk/dhfs/repository/SyncHandler.java | 9 +++++---- .../repository/invalidation/IndexUpdateOp.java | 2 +- .../invalidation/InvalidationQueueEntry.java | 2 +- .../invalidation/InvalidationQueueService.java | 2 +- .../dhfs/repository/invalidation/Op.java | 2 +- .../dhfs/repository/invalidation/OpHandler.java | 2 +- .../dhfs/repository/invalidation/OpPusher.java | 6 +++--- .../repository/invalidation/PushOpHandler.java | 2 +- .../dhfs/repository/peersync/PeerInfo.java | 2 +- .../repository/peersync/PeerInfoService.java | 8 ++++---- .../peersync/PeerInfoSyncHandler.java | 4 ++-- .../structs/JKleppmannTreeNodeMetaPeer.java | 2 +- .../peertrust/PeerInfoCertUpdateTxHook.java | 8 ++++---- .../java/com/usatiuk/dhfs/RefcounterTest.java | 8 ++++---- .../dhfs/benchmarks/DhfsFileBenchmarkTest.java | 2 +- .../files/DhfsFileServiceSimpleTestImpl.java | 4 ++-- .../objects/testobjs/TestRefcount.java | 4 ++-- 137 files changed, 322 insertions(+), 315 deletions(-) delete mode 100644 dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JData.java (94%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JDataVersionedWrapper.java (76%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JDataVersionedWrapperImpl.java (90%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JDataVersionedWrapperLazy.java (96%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JDataVersionedWrapperSerializer.java (96%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JObjectKey.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/JavaDataSerializer.java (95%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/ObjectSerializer.java (81%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/CloseableKvIterator.java (91%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/Data.java (80%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/IterProdFn.java (76%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/IteratorStart.java (58%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/KeyPredicateKvIterator.java (98%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/MappingKvIterator.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/MaybeTombstone.java (67%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/MergingKvIterator.java (99%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/NavigableMapKvIterator.java (98%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/PredicateKvIterator.java (98%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/ReversedKvIterator.java (96%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/ReversibleKvIterator.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/Tombstone.java (79%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/iterators/TombstoneMergingKvIterator.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/Snapshot.java (62%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotEntry.java (73%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotEntryDeleted.java (84%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotEntryObject.java (72%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotKey.java (81%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotKvIterator.java (96%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotManager.java (77%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/CachingObjectPersistentStore.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/LmdbObjectPersistentStore.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/MemoryObjectPersistentStore.java (91%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/ObjectPersistentStore.java (80%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/PendingDelete.java (52%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/PendingWrite.java (52%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/PendingWriteEntry.java (59%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/SerializingObjectPersistentStore.java (84%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/TxManifestObj.java (77%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/TxManifestRaw.java (79%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/stores/WritebackObjectPersistentStore.java (98%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/CurrentTransaction.java (81%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/JObjectManager.java (97%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/LockManager.java (86%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/LockingStrategy.java (80%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/PreCommitTxHook.java (69%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/Transaction.java (75%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionFactory.java (64%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionFactoryImpl.java (96%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionHandle.java (62%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionHandlePrivate.java (75%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionManager.java (98%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionManagerImpl.java (97%) create mode 100644 dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObject.java rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionObjectLocked.java (64%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionObjectNoLock.java (55%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TransactionPrivate.java (72%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TxCommitException.java (83%) rename dhfs-parent/objects/src/main/java/com/usatiuk/{dhfs => }/objects/transaction/TxRecord.java (75%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/Just.java (98%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/ObjectsTestExtraChecksTest.java (86%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/ObjectsTestImpl.java (99%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/ObjectsTestNoExtraChecksTest.java (87%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/PreCommitTxHookTest.java (94%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/TempDataProfile.java (96%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/TestDataCleaner.java (97%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/data/Kid.java (54%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/data/Parent.java (56%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/iterators/KeyPredicateKvIteratorTest.java (98%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/iterators/MergingKvIteratorTest.java (99%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/iterators/NavigableMapKvIteratorTest.java (97%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/iterators/PredicateKvIteratorTest.java (98%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/snapshot/SnapshotKvIteratorTest.java (50%) rename dhfs-parent/objects/src/test/java/com/usatiuk/{dhfs => }/objects/stores/LmdbKvIteratorTest.java (96%) rename dhfs-parent/server/src/test/java/com/usatiuk/{dhfs => }/objects/testobjs/TestRefcount.java (91%) diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java b/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java deleted file mode 100644 index 05826900..00000000 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObject.java +++ /dev/null @@ -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 { - Optional data(); -} diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JData.java similarity index 94% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JData.java index 501e3c35..82c7b0e4 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapper.java similarity index 76% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapper.java index 6cfd012f..10e5a2ed 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapper.java +++ b/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(); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperImpl.java similarity index 90% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperImpl.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperImpl.java index 25bf8438..3a2bce6d 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperImpl.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperLazy.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperLazy.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperLazy.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperLazy.java index 0dc978d4..6c805f15 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperLazy.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperSerializer.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperSerializer.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperSerializer.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JDataVersionedWrapperSerializer.java index 15f7dca9..12e67bf0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JDataVersionedWrapperSerializer.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JObjectKey.java index 4e73c2a7..d0670e96 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JavaDataSerializer.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java similarity index 95% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JavaDataSerializer.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java index d75b35d5..21e6086e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JavaDataSerializer.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ObjectSerializer.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/ObjectSerializer.java similarity index 81% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ObjectSerializer.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/ObjectSerializer.java index 078dd90f..788f5a52 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ObjectSerializer.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java similarity index 91% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java index 46c05445..e6cbb19b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/CloseableKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Data.java similarity index 80% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Data.java index b036d366..145a6769 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Data.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IterProdFn.java similarity index 76% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IterProdFn.java index 6ac811d6..05395201 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IterProdFn.java +++ b/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, V> { diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IteratorStart.java similarity index 58% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/IteratorStart.java index f63a2a3a..7eae925f 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/IteratorStart.java +++ b/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, diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/KeyPredicateKvIterator.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/KeyPredicateKvIterator.java index 97a8058a..ac956dfc 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MappingKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MappingKvIterator.java index db3322c0..b238564b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MappingKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MaybeTombstone.java similarity index 67% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MaybeTombstone.java index 0a39c3c3..34122def 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MaybeTombstone.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MergingKvIterator.java similarity index 99% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/MergingKvIterator.java index c68b7e78..d07a623b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/MergingKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/NavigableMapKvIterator.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/NavigableMapKvIterator.java index 149a9a27..358cc94c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/PredicateKvIterator.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/PredicateKvIterator.java index 5492b2de..45026bc2 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversedKvIterator.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversedKvIterator.java index b53ac4b9..678a5979 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversedKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversibleKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/ReversibleKvIterator.java index b1c0f400..c8fef4db 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/ReversibleKvIterator.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Tombstone.java similarity index 79% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/Tombstone.java index 17618a15..34e0adf0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/Tombstone.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/TombstoneMergingKvIterator.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/TombstoneMergingKvIterator.java index 3f2fce7c..27566d11 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/iterators/TombstoneMergingKvIterator.java +++ b/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; 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/objects/snapshot/Snapshot.java similarity index 62% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java index b3e245c8..a9b89c00 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/Snapshot.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntry.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntry.java similarity index 73% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntry.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntry.java index e783a2cf..853227a4 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntry.java +++ b/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(); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryDeleted.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryDeleted.java similarity index 84% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryDeleted.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryDeleted.java index 71113d45..a94822b0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryDeleted.java +++ b/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 diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryObject.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryObject.java similarity index 72% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryObject.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotEntryObject.java index 98cfbefc..205dfc69 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotEntryObject.java +++ b/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 diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKey.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotKey.java similarity index 81% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKey.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotKey.java index dd8a5f07..8652154f 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKey.java +++ b/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; 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/objects/snapshot/SnapshotKvIterator.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotKvIterator.java index 753306e2..f01660a1 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIterator.java +++ b/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; 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/objects/snapshot/SnapshotManager.java similarity index 77% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/SnapshotManager.java index 9ff7cd87..52c0170e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/snapshot/SnapshotManager.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/CachingObjectPersistentStore.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/CachingObjectPersistentStore.java index bf612ec9..9135cb5c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/CachingObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java index 73b7b3d5..c291a225 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/LmdbObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/MemoryObjectPersistentStore.java similarity index 91% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/MemoryObjectPersistentStore.java index af8fcf69..d4e4db37 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/MemoryObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/ObjectPersistentStore.java similarity index 80% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/ObjectPersistentStore.java index 840adaf9..748ac043 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/ObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingDelete.java similarity index 52% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingDelete.java index 235e8c99..34709575 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingDelete.java +++ b/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 { } diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWrite.java similarity index 52% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWrite.java index a320009d..f8bfc7a5 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWrite.java +++ b/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 { } diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWriteEntry.java similarity index 59% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/PendingWriteEntry.java index 732bb3db..52d4edd0 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/PendingWriteEntry.java +++ b/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(); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java similarity index 84% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java index ff76a700..063cfd4c 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/SerializingObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestObj.java similarity index 77% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestObj.java index 6e65f5b5..debb2aa8 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestObj.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestRaw.java similarity index 79% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/TxManifestRaw.java index 93309415..cda13e57 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/TxManifestRaw.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/WritebackObjectPersistentStore.java index 29c407f9..094c3ccd 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/stores/WritebackObjectPersistentStore.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java similarity index 81% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/CurrentTransaction.java index 2988cdcb..7b02d6b1 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/CurrentTransaction.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java index 6efc9bfe..8f49adc5 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/JObjectManager.java +++ b/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 diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java similarity index 86% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java index ad950fd0..33c85a0d 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockManager.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockingStrategy.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockingStrategy.java similarity index 80% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockingStrategy.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockingStrategy.java index 1cf28822..ad96ac07 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/LockingStrategy.java +++ b/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 diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/PreCommitTxHook.java similarity index 69% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/PreCommitTxHook.java index bb933779..6598178b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/PreCommitTxHook.java +++ b/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) { 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/objects/transaction/Transaction.java similarity index 75% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/Transaction.java index ae182de9..216aae0b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactory.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactory.java similarity index 64% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactory.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactory.java index 634daa22..76d39a94 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactory.java +++ b/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(); 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/objects/transaction/TransactionFactoryImpl.java similarity index 96% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java index 8dcf500f..0d7bec9e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandle.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandle.java similarity index 62% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandle.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandle.java index 262798c6..ac3d8d81 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandle.java +++ b/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); diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandlePrivate.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandlePrivate.java similarity index 75% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandlePrivate.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionHandlePrivate.java index cc9c8e7d..e340f4e8 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionHandlePrivate.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java similarity index 98% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java index 313588a2..e7f69b66 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManager.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java similarity index 97% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManagerImpl.java index e22113e1..a045dae9 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionManagerImpl.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObject.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObject.java new file mode 100644 index 00000000..4b71102b --- /dev/null +++ b/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 { + Optional data(); +} diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java similarity index 64% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java index 333ac63d..75b5fe38 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectLocked.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectNoLock.java similarity index 55% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectNoLock.java index 1260cb4c..d28446e4 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectNoLock.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java similarity index 72% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java index 5a8266a2..52a4ef9b 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java +++ b/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; diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxCommitException.java similarity index 83% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxCommitException.java index 130c15b0..0afea63e 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxCommitException.java +++ b/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) { diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxRecord.java similarity index 75% rename from dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java rename to dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TxRecord.java index f5510e6f..e8661bb6 100644 --- a/dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java +++ b/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 { diff --git a/dhfs-parent/objects/src/main/resources/application.properties b/dhfs-parent/objects/src/main/resources/application.properties index 5ec5eb9a..2b79369f 100644 --- a/dhfs-parent/objects/src/main/resources/application.properties +++ b/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 diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/Just.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/Just.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/Just.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/Just.java index 0c78cd79..057e220a 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/Just.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestExtraChecksTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestExtraChecksTest.java similarity index 86% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestExtraChecksTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestExtraChecksTest.java index 5a0c050b..ede31113 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestExtraChecksTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestImpl.java similarity index 99% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestImpl.java index 87b9e290..83d0c9cc 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestImpl.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestNoExtraChecksTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestNoExtraChecksTest.java similarity index 87% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestNoExtraChecksTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestNoExtraChecksTest.java index 4a3199fb..4beebfb2 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTestNoExtraChecksTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/PreCommitTxHookTest.java similarity index 94% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/PreCommitTxHookTest.java index bcee0138..82a7408a 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/PreCommitTxHookTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TempDataProfile.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/TempDataProfile.java similarity index 96% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TempDataProfile.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/TempDataProfile.java index 16c37789..9eb64081 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TempDataProfile.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TestDataCleaner.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/TestDataCleaner.java similarity index 97% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TestDataCleaner.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/TestDataCleaner.java index 957373ec..4fbb0f55 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/TestDataCleaner.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Kid.java similarity index 54% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Kid.java index b49d163f..57a6e928 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java +++ b/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) { diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Parent.java similarity index 56% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/data/Parent.java index c6dcbbb0..2d2051d2 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java +++ b/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) { diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/KeyPredicateKvIteratorTest.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/KeyPredicateKvIteratorTest.java index 4ebc7d41..e55f7065 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/KeyPredicateKvIteratorTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/MergingKvIteratorTest.java similarity index 99% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/MergingKvIteratorTest.java index 9f5d6ff6..7e8127b0 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/MergingKvIteratorTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/NavigableMapKvIteratorTest.java similarity index 97% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/NavigableMapKvIteratorTest.java index ae99d477..033670ce 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/NavigableMapKvIteratorTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/PredicateKvIteratorTest.java similarity index 98% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/iterators/PredicateKvIteratorTest.java index 1aabb784..5cc3eb97 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/iterators/PredicateKvIteratorTest.java +++ b/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; diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/snapshot/SnapshotKvIteratorTest.java similarity index 50% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/snapshot/SnapshotKvIteratorTest.java index c63f1bc6..6505bcd6 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/snapshot/SnapshotKvIteratorTest.java +++ b/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 { diff --git a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/stores/LmdbKvIteratorTest.java similarity index 96% rename from dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java rename to dhfs-parent/objects/src/test/java/com/usatiuk/objects/stores/LmdbKvIteratorTest.java index 5902b84e..a8401182 100644 --- a/dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/stores/LmdbKvIteratorTest.java +++ b/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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java index dd097b93..232bac69 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; -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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java index 0c6d2a6d..10761f27 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs; import com.usatiuk.dhfs.jmap.JMapRef; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; public record JDataNormalRef(JObjectKey obj) implements JDataRef { @Override diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java index 8e450210..8a5be7f3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java index 99351223..8bfedda2 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import org.pcollections.PCollection; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java index ba1ad787..b4e47411 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.repository.JDataRemoteDto; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java index ddb0de34..d442b6d0 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.persistence.JObjectKeyP; import jakarta.inject.Singleton; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java index dcd830d2..c24ee628 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java index 1e18e469..4616dcad 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; -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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java index 839d9097..44344155 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java @@ -1,11 +1,11 @@ package com.usatiuk.dhfs; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.PreCommitTxHook; +import com.usatiuk.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java index 43a396c0..4916f38f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import org.pcollections.HashTreePSet; import org.pcollections.PCollection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java index c99e0b55..72b25d20 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java @@ -1,12 +1,12 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +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.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java index 07dcc8ff..84f59dfc 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import org.pcollections.*; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java index ac34a56a..37f1b5cb 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java @@ -1,11 +1,11 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; +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.dhfs.objects.transaction.LockingStrategy; -import com.usatiuk.dhfs.objects.transaction.Transaction; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java index 90489985..868c5190 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.files.objects; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.JDataRemote; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.repository.JDataRemoteDto; public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto { diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java index 40201df2..f5c6dd52 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.persistence.ChunkDataP; import com.usatiuk.dhfs.persistence.JObjectKeyP; import jakarta.inject.Singleton; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java index a0477902..6b6df305 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.dhfs.JDataRemote; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.jmap.JMapHolder; import com.usatiuk.dhfs.jmap.JMapLongKey; import com.usatiuk.dhfs.repository.JDataRemoteDto; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java index f4c69f48..1a8f66ea 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.dhfs.JDataRemote; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.repository.JDataRemoteDto; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java index 31bdd0e0..20455770 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.files.objects; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.jmap.JMapHelper; import com.usatiuk.dhfs.jmap.JMapLongKey; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java index 7ff7c9d6..324cb822 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java @@ -5,15 +5,15 @@ import com.usatiuk.dhfs.RemoteObjectDataWrapper; import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.files.service.DhfsFileService; -import com.usatiuk.dhfs.objects.*; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; import com.usatiuk.dhfs.jmap.JMapHelper; import com.usatiuk.dhfs.repository.ObjSyncHandler; import com.usatiuk.dhfs.repository.PersistentPeerDataService; import com.usatiuk.dhfs.repository.SyncHelper; -import com.usatiuk.dhfs.objects.transaction.LockingStrategy; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.transaction.LockingStrategy; +import com.usatiuk.objects.transaction.Transaction; import com.usatiuk.kleppmanntree.AlreadyExistsException; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java index fcc1584c..909ca7f0 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.files.service; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import org.apache.commons.lang3.tuple.Pair; import java.util.Optional; 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 d737fcb4..9e0cf2b1 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 @@ -7,8 +7,9 @@ import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.files.objects.ChunkData; import com.usatiuk.dhfs.files.objects.File; -import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.iterators.IteratorStart; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; @@ -17,9 +18,9 @@ import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; import com.usatiuk.dhfs.jmap.JMapEntry; import com.usatiuk.dhfs.jmap.JMapHelper; import com.usatiuk.dhfs.jmap.JMapLongKey; -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.transaction.LockingStrategy; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.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/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java index 4374d9cb..7f45608f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.jkleppmanntree; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData; import com.usatiuk.dhfs.repository.InitialSyncProcessor; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java index d695d3f5..d0a6dfa2 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java @@ -1,14 +1,14 @@ package com.usatiuk.dhfs.jkleppmanntree; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.jkleppmanntree.structs.*; import com.usatiuk.dhfs.repository.PersistentPeerDataService; import com.usatiuk.dhfs.repository.invalidation.Op; import com.usatiuk.dhfs.repository.peersync.PeerInfoService; -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.transaction.LockingStrategy; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.TransactionManager; import com.usatiuk.kleppmanntree.*; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java index 100184c9..3a3ed51c 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.jkleppmanntree; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java index a567aa99..3f97f8a4 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.jkleppmanntree; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.invalidation.Op; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java index 79d37c9f..9b74d494 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.jkleppmanntree.structs; import com.usatiuk.dhfs.JDataRef; import com.usatiuk.dhfs.JDataRefcounted; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; import com.usatiuk.kleppmanntree.OpMove; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java index a472b4e8..13b449bf 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.jkleppmanntree.structs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import java.util.Objects; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java index 67f68b81..a6fea511 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.jkleppmanntree.structs; import com.usatiuk.dhfs.JDataRef; import com.usatiuk.dhfs.JDataRefcounted; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.kleppmanntree.CombinedTimestamp; import com.usatiuk.kleppmanntree.LogRecord; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java index ea95747f..8fd0a0b9 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.jmap; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; public record JMapEntry(JObjectKey holder, K selfKey, diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java index 49a5120e..96a4801a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs.jmap; -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.transaction.Transaction; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.iterators.CloseableKvIterator; +import com.usatiuk.objects.iterators.IteratorStart; +import com.usatiuk.objects.transaction.Transaction; 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/jmap/JMapHolder.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java index 1689c64f..c77229db 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.jmap; -import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.objects.JData; public interface JMapHolder extends JData { } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java index 77b46486..c30c0e81 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java @@ -3,9 +3,10 @@ package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.JDataRefcounted; import com.usatiuk.dhfs.RemoteObjectDataWrapper; import com.usatiuk.dhfs.RemoteObjectMeta; -import com.usatiuk.dhfs.objects.*; -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 jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java index aeba164c..4389ba80 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java @@ -1,8 +1,8 @@ package com.usatiuk.dhfs.jmap; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.iterators.CloseableKvIterator; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java index 1e767162..5045f210 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.JDataNormalRef; import com.usatiuk.dhfs.JDataRef; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import java.util.Comparator; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java index 8e2beb29..397c0e28 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java @@ -1,11 +1,11 @@ package com.usatiuk.dhfs.jmap; -import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.objects.JData; import com.usatiuk.dhfs.JDataRefcounted; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.RemoteObjectMeta; -import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; -import com.usatiuk.dhfs.objects.transaction.Transaction; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java index 350e6211..bd4b8dfe 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java @@ -3,10 +3,11 @@ package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.RemoteTransaction; -import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.iterators.IteratorStart; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.iterators.IteratorStart; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java index 1c120f64..893b53e3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java @@ -1,11 +1,11 @@ package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.PreCommitTxHook; +import com.usatiuk.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java index ff33321b..223ca6e3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java @@ -4,8 +4,8 @@ import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.RemoteObjectDataWrapper; import com.usatiuk.dhfs.RemoteObjectMeta; -import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.transaction.Transaction; 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/repository/InitialSyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java index 80f9c670..e5dca989 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; public interface InitialSyncProcessor { diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java index e27b575f..f247072e 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.JDataRemote; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import org.pcollections.PMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java index 2334b2f1..8ecd0a26 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java @@ -8,8 +8,8 @@ import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.repository.peersync.api.PeerSyncApiClientDynamic; import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager; import com.usatiuk.dhfs.repository.webapi.AvailablePeerInfo; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.TransactionManager; import io.quarkus.logging.Log; import io.quarkus.runtime.StartupEvent; import io.quarkus.scheduler.Scheduled; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java index 052f6d78..7e997d75 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java @@ -4,8 +4,8 @@ import com.usatiuk.dhfs.ShutdownChecker; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.TransactionManager; import io.quarkus.logging.Log; import io.quarkus.runtime.StartupEvent; import jakarta.annotation.Priority; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java index baabb3d1..e7983a39 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import org.pcollections.PSet; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java index d2806f68..8e70b668 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java @@ -2,12 +2,12 @@ package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; import com.usatiuk.dhfs.*; -import com.usatiuk.dhfs.objects.*; import com.usatiuk.dhfs.persistence.JObjectKeyP; import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.repository.invalidation.Op; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.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/repository/RemoteObjectServiceServerImpl.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java index 3548241d..bc4b81ea 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java @@ -2,13 +2,13 @@ package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; import com.usatiuk.dhfs.*; -import com.usatiuk.dhfs.objects.*; import com.usatiuk.dhfs.persistence.JObjectKeyP; import com.usatiuk.dhfs.repository.invalidation.Op; import com.usatiuk.dhfs.repository.invalidation.OpHandler; import com.usatiuk.dhfs.repository.syncmap.DtoMapperService; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.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/repository/SyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java index 58af1e30..e109cbbf 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java @@ -3,11 +3,12 @@ package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.RemoteTransaction; -import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.iterators.IteratorStart; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.iterators.IteratorStart; import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.TransactionManager; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java index 89dafb8b..746a96ec 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.JDataRemoteDto; import org.pcollections.PMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java index 85d1eed1..98253e2b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java index 162ae627..7eda3a19 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.PeerManager; import com.usatiuk.dhfs.repository.PersistentPeerDataService; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java index 28f765b4..a0021f05 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import java.io.Serializable; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java index de001c76..26741734 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java @@ -4,7 +4,7 @@ import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeOpWrapper; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreePeriodicPushOp; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java index 083265f8..517b582f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.objects.JData; import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; @@ -9,8 +9,8 @@ import com.usatiuk.dhfs.repository.JDataRemoteDto; import com.usatiuk.dhfs.repository.JDataRemotePush; import com.usatiuk.dhfs.repository.RemoteObjectServiceClient; import com.usatiuk.dhfs.repository.syncmap.DtoMapperService; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.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/repository/invalidation/PushOpHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java index 3ca1800a..ff7614f0 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.repository.SyncHandler; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java index 1934c617..8f5898bf 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java @@ -2,7 +2,7 @@ package com.usatiuk.dhfs.repository.peersync; import com.google.protobuf.ByteString; import com.usatiuk.dhfs.JDataRemote; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.repository.CertificateTools; import com.usatiuk.dhfs.repository.JDataRemoteDto; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java index b75671f0..b173c1f1 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java @@ -1,15 +1,15 @@ package com.usatiuk.dhfs.repository.peersync; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode; import com.usatiuk.dhfs.repository.PersistentPeerDataService; import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; -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.transaction.LockingStrategy; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.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/repository/peersync/PeerInfoSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java index 45bbaa44..d1daffb1 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java @@ -4,11 +4,11 @@ import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.RemoteObjectDataWrapper; import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.RemoteTransaction; -import com.usatiuk.dhfs.objects.*; import com.usatiuk.dhfs.repository.ObjSyncHandler; import com.usatiuk.dhfs.repository.PersistentPeerDataService; import com.usatiuk.dhfs.repository.SyncHelper; -import com.usatiuk.dhfs.objects.transaction.Transaction; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.transaction.Transaction; 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/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java index 151ac6ae..27f1bcb8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java @@ -1,6 +1,6 @@ package com.usatiuk.dhfs.repository.peersync.structs; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.PeerId; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java index 55d8527e..f6af060a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.repository.peertrust; -import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JData; +import com.usatiuk.objects.JObjectKey; import com.usatiuk.dhfs.RemoteObjectDataWrapper; import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode; import com.usatiuk.dhfs.repository.PersistentPeerDataService; @@ -9,8 +9,8 @@ import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.repository.peersync.PeerInfo; import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; -import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; -import com.usatiuk.dhfs.objects.transaction.Transaction; +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; diff --git a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/RefcounterTest.java b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/RefcounterTest.java index b41b64e9..81165593 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/RefcounterTest.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/RefcounterTest.java @@ -1,9 +1,9 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.testobjs.TestRefcount; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.JObjectKey; +import com.usatiuk.objects.testobjs.TestRefcount; +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 jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java index 504c1cc6..38bb021b 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.benchmarks; import com.google.protobuf.UnsafeByteOperations; import com.usatiuk.dhfs.TempDataProfile; import com.usatiuk.dhfs.files.service.DhfsFileService; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import jakarta.inject.Inject; 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 95309c47..0befdbdb 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,8 +4,8 @@ import com.usatiuk.dhfs.TempDataProfile; import com.usatiuk.dhfs.files.objects.File; import com.usatiuk.dhfs.files.service.DhfsFileService; import com.usatiuk.dhfs.RemoteTransaction; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; +import com.usatiuk.objects.transaction.Transaction; +import com.usatiuk.objects.transaction.TransactionManager; import com.usatiuk.kleppmanntree.AlreadyExistsException; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; diff --git a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/objects/testobjs/TestRefcount.java b/dhfs-parent/server/src/test/java/com/usatiuk/objects/testobjs/TestRefcount.java similarity index 91% rename from dhfs-parent/server/src/test/java/com/usatiuk/dhfs/objects/testobjs/TestRefcount.java rename to dhfs-parent/server/src/test/java/com/usatiuk/objects/testobjs/TestRefcount.java index f13bdddb..10be3ed5 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/objects/testobjs/TestRefcount.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/objects/testobjs/TestRefcount.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.testobjs; +package com.usatiuk.objects.testobjs; import com.usatiuk.dhfs.JDataRef; import com.usatiuk.dhfs.JDataRefcounted; -import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.objects.JObjectKey; import org.pcollections.HashTreePSet; import org.pcollections.PCollection;