diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ConflictResolver.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ConflictResolver.java similarity index 78% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ConflictResolver.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ConflictResolver.java index f3b1acc7..da03eb9b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ConflictResolver.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ConflictResolver.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; public interface ConflictResolver { void resolve(PeerId fromPeer, RemoteObjectMeta ours, RemoteObjectMeta theirs); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java index 0a32966d..dd097b93 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/DeleterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java @@ -1,5 +1,7 @@ -package com.usatiuk.dhfs.objects; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataNormalRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java similarity index 80% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataNormalRef.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java index 9beec454..0c6d2a6d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataNormalRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java @@ -1,6 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.jmap.JMapRef; +import com.usatiuk.dhfs.jmap.JMapRef; +import com.usatiuk.dhfs.objects.JObjectKey; public record JDataNormalRef(JObjectKey obj) implements JDataRef { @Override diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java similarity index 63% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRef.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java index 64b467d7..8e450210 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java @@ -1,4 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; + +import com.usatiuk.dhfs.objects.JObjectKey; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java similarity index 78% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java index 0626fda1..99351223 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRefcounted.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java @@ -1,5 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; import org.pcollections.PCollection; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRemote.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java similarity index 80% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRemote.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java index 88452a13..ba1ad787 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JDataRemote.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java @@ -1,6 +1,7 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import java.io.Serializable; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JObjectKeyProtoSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java similarity index 79% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JObjectKeyProtoSerializer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java index e27b10e8..ddb0de34 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/JObjectKeyProtoSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java @@ -1,7 +1,8 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; +import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.dhfs.persistence.JObjectKeyP; import jakarta.inject.Singleton; @Singleton diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/PeerId.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java similarity index 86% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/PeerId.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java index 339f2a53..dcd830d2 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/PeerId.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java @@ -1,4 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; + +import com.usatiuk.dhfs.objects.JObjectKey; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ReceivedObject.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ReceivedObject.java similarity index 55% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ReceivedObject.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ReceivedObject.java index 0312d357..022656ee 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/ReceivedObject.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ReceivedObject.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import org.pcollections.PMap; public record ReceivedObject(PMap changelog, JDataRemoteDto data) { diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java similarity index 95% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java index 157836c6..1e18e469 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java @@ -1,5 +1,7 @@ -package com.usatiuk.dhfs.objects; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java similarity index 84% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java index 2b976acb..839d9097 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjPusherTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java @@ -1,7 +1,9 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData; -import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData; +import com.usatiuk.dhfs.objects.JData; +import com.usatiuk.dhfs.objects.JObjectKey; +import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDataWrapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDataWrapper.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java index 955ec26c..43a396c0 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDataWrapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java @@ -1,5 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; +import com.usatiuk.dhfs.objects.JObjectKey; import org.pcollections.HashTreePSet; import org.pcollections.PCollection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java index 2b6c11ad..c99e0b55 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectDeleter.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java @@ -1,9 +1,10 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.repository.AutosyncProcessor; -import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.objects.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.dhfs.utils.HashSetDelayedBlockingQueue; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectMeta.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java similarity index 98% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectMeta.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java index 91946446..07dcc8ff 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteObjectMeta.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java @@ -1,5 +1,6 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; +import com.usatiuk.dhfs.objects.JObjectKey; import org.pcollections.*; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteTransaction.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteTransaction.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java index ae6f7c79..ac34a56a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/RemoteTransaction.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java @@ -1,8 +1,9 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient; -import com.usatiuk.dhfs.objects.repository.SyncHandler; +import com.usatiuk.dhfs.objects.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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/TemporaryOpSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java similarity index 80% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/TemporaryOpSerializer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java index ab9682db..b37c5f1e 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/TemporaryOpSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects; +package com.usatiuk.dhfs; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.repository.OpP; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; +import com.usatiuk.dhfs.repository.OpP; +import com.usatiuk.dhfs.repository.invalidation.Op; import com.usatiuk.dhfs.utils.SerializationHelper; import jakarta.inject.Singleton; 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 795b4d4e..90489985 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 @@ -1,9 +1,9 @@ package com.usatiuk.dhfs.files.objects; import com.google.protobuf.ByteString; -import com.usatiuk.dhfs.objects.JDataRemote; +import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.repository.JDataRemoteDto; public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto { @Override 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 99588eff..40201df2 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 @@ -2,8 +2,8 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.persistence.ChunkDataP; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; +import com.usatiuk.dhfs.persistence.ChunkDataP; +import com.usatiuk.dhfs.persistence.JObjectKeyP; import jakarta.inject.Singleton; @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 9b3fd155..a0477902 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,10 +1,10 @@ package com.usatiuk.dhfs.files.objects; -import com.usatiuk.dhfs.objects.JDataRemote; +import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.jmap.JMapHolder; -import com.usatiuk.dhfs.objects.jmap.JMapLongKey; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.jmap.JMapHolder; +import com.usatiuk.dhfs.jmap.JMapLongKey; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import java.util.Collection; import java.util.Set; 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 66637b88..f4c69f48 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,8 +1,8 @@ package com.usatiuk.dhfs.files.objects; -import com.usatiuk.dhfs.objects.JDataRemote; +import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import org.apache.commons.lang3.tuple.Pair; import java.util.List; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java index f04ba212..04b34ddf 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.files.objects; -import com.usatiuk.dhfs.objects.jmap.JMapHelper; -import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapper; +import com.usatiuk.dhfs.jmap.JMapHelper; +import com.usatiuk.dhfs.repository.syncmap.DtoMapper; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; 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 69472a9c..31bdd0e0 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,8 +1,8 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.jmap.JMapHelper; -import com.usatiuk.dhfs.objects.jmap.JMapLongKey; +import com.usatiuk.dhfs.jmap.JMapHelper; +import com.usatiuk.dhfs.jmap.JMapLongKey; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java index 4f5a4324..eef0b550 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.files.objects; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.persistence.FileDtoP; +import com.usatiuk.dhfs.persistence.FileDtoP; import com.usatiuk.dhfs.utils.SerializationHelper; import jakarta.inject.Singleton; 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 f2e74583..7ff7c9d6 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 @@ -1,13 +1,17 @@ package com.usatiuk.dhfs.files.objects; +import com.usatiuk.dhfs.PeerId; +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.objects.jkleppmanntree.JKleppmannTreeManager; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; -import com.usatiuk.dhfs.objects.jmap.JMapHelper; -import com.usatiuk.dhfs.objects.repository.ObjSyncHandler; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.SyncHelper; +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.kleppmanntree.AlreadyExistsException; 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 e3cb02f7..d737fcb4 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 @@ -2,18 +2,21 @@ package com.usatiuk.dhfs.files.service; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; +import com.usatiuk.dhfs.JDataRemote; +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.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; -import com.usatiuk.dhfs.objects.jmap.JMapEntry; -import com.usatiuk.dhfs.objects.jmap.JMapHelper; -import com.usatiuk.dhfs.objects.jmap.JMapLongKey; +import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java similarity index 67% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java index efbe3b85..4374d9cb 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree; +package com.usatiuk.dhfs.jkleppmanntree; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData; -import com.usatiuk.dhfs.objects.repository.InitialSyncProcessor; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData; +import com.usatiuk.dhfs.repository.InitialSyncProcessor; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java similarity index 97% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java index 49a5b123..d695d3f5 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java @@ -1,11 +1,11 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree; +package com.usatiuk.dhfs.jkleppmanntree; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.*; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java similarity index 67% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java index 1bcf5798..100184c9 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeOpWrapper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java @@ -1,10 +1,10 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree; +package com.usatiuk.dhfs.jkleppmanntree; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile; +import com.usatiuk.dhfs.repository.invalidation.Op; import com.usatiuk.kleppmanntree.OpMove; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeerInterface.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java similarity index 67% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeerInterface.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java index 902a8543..d1f8e006 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeerInterface.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree; +package com.usatiuk.dhfs.jkleppmanntree; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; +import com.usatiuk.dhfs.repository.peersync.PeerInfo; +import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import com.usatiuk.kleppmanntree.PeerInterface; import jakarta.inject.Inject; import jakarta.inject.Singleton; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeriodicPushOp.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java similarity index 72% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeriodicPushOp.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java index 6ddf10ae..a567aa99 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreePeriodicPushOp.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree; +package com.usatiuk.dhfs.jkleppmanntree; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.invalidation.Op; import java.io.Serializable; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java similarity index 91% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java index f8300529..79d37c9f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNode.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java @@ -1,10 +1,10 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree.structs; +package com.usatiuk.dhfs.jkleppmanntree.structs; -import com.usatiuk.dhfs.objects.JDataRef; -import com.usatiuk.dhfs.objects.JDataRefcounted; +import com.usatiuk.dhfs.JDataRef; +import com.usatiuk.dhfs.JDataRefcounted; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; import com.usatiuk.kleppmanntree.OpMove; import com.usatiuk.kleppmanntree.TreeNode; import org.pcollections.HashTreePMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java index fef8e967..6c8672cf 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree.structs; +package com.usatiuk.dhfs.jkleppmanntree.structs; import com.usatiuk.kleppmanntree.NodeMeta; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java similarity index 84% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java index 4cf3514d..e3ae7e24 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree.structs; +package com.usatiuk.dhfs.jkleppmanntree.structs; public class JKleppmannTreeNodeMetaDirectory extends JKleppmannTreeNodeMeta { public JKleppmannTreeNodeMetaDirectory(String name) { diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java similarity index 95% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java index dbd9f8ab..a472b4e8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree.structs; +package com.usatiuk.dhfs.jkleppmanntree.structs; import com.usatiuk.dhfs.objects.JObjectKey; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java similarity index 92% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java index a363cd46..67f68b81 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/structs/JKleppmannTreePersistentData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.jkleppmanntree.structs; +package com.usatiuk.dhfs.jkleppmanntree.structs; -import com.usatiuk.dhfs.objects.JDataRef; -import com.usatiuk.dhfs.objects.JDataRefcounted; +import com.usatiuk.dhfs.JDataRef; +import com.usatiuk.dhfs.JDataRefcounted; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import com.usatiuk.kleppmanntree.CombinedTimestamp; import com.usatiuk.kleppmanntree.LogRecord; import com.usatiuk.kleppmanntree.OpMove; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapEntry.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java similarity index 90% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapEntry.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java index e8b897f6..ea95747f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapEntry.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java similarity index 98% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java index 4bc5e032..49a5120e 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHelper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolder.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java similarity index 73% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolder.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java index 873abce3..1689c64f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolder.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.objects.JData; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java similarity index 86% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java index 6c8c669e..77b46486 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapHolderRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java @@ -1,5 +1,8 @@ -package com.usatiuk.dhfs.objects.jmap; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java similarity index 98% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java index 64a1da4e..aeba164c 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapIterator.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapKey.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java similarity index 59% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapKey.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java index b2292e40..da3435f4 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapKey.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; public interface JMapKey extends Comparable { } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapLongKey.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapLongKey.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java index 7a5f0f34..ce6d5bbb 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapLongKey.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import javax.annotation.Nonnull; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRef.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java similarity index 83% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRef.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java index 8f4b55bd..1e767162 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRef.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; -import com.usatiuk.dhfs.objects.JDataNormalRef; -import com.usatiuk.dhfs.objects.JDataRef; +import com.usatiuk.dhfs.JDataNormalRef; +import com.usatiuk.dhfs.JDataRef; import com.usatiuk.dhfs.objects.JObjectKey; import java.util.Comparator; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java index 3d6577b9..8e2beb29 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jmap/JMapRefcounterTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.jmap; +package com.usatiuk.dhfs.jmap; import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.JDataRefcounted; +import com.usatiuk.dhfs.JDataRefcounted; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.RemoteObjectMeta; +import com.usatiuk.dhfs.RemoteObjectMeta; import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook; import com.usatiuk.dhfs.objects.transaction.Transaction; import io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddress.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddress.java deleted file mode 100644 index 5fba5e26..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddress.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery; - -import com.usatiuk.dhfs.objects.PeerId; - -public interface PeerAddress { - PeerId peer(); - - PeerAddressType type(); -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapper.java deleted file mode 100644 index bb7736ee..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.syncmap; - -import com.usatiuk.dhfs.objects.JDataRemote; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; - -public interface DtoMapper { - D toDto(F obj); - - F fromDto(D dto); -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/AvailablePeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/AvailablePeerInfo.java deleted file mode 100644 index 0dbf2687..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/AvailablePeerInfo.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.webapi; - -public record AvailablePeerInfo(String uuid) { -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerDelete.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerDelete.java deleted file mode 100644 index 2d646474..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerDelete.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.webapi; - -public record KnownPeerDelete(String uuid) { -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerInfo.java deleted file mode 100644 index 5fbd9eb7..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerInfo.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.webapi; - -public record KnownPeerInfo(String uuid) { -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerPut.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerPut.java deleted file mode 100644 index f1e109f8..00000000 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerPut.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.usatiuk.dhfs.objects.repository.webapi; - -public record KnownPeerPut(String uuid) { -} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java index bff1d1f3..350e6211 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java @@ -1,5 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java similarity index 89% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java index 5394b328..1c120f64 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.RemoteObjectMeta; -import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; +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 jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/CertificateTools.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java similarity index 98% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/CertificateTools.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java index aeea40b5..64e002ce 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/CertificateTools.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import org.apache.commons.codec.digest.DigestUtils; import org.bouncycastle.asn1.ASN1ObjectIdentifier; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/DefaultObjSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java similarity index 95% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/DefaultObjSyncHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java index 1472ec17..ff33321b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/DefaultObjSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java @@ -1,5 +1,9 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/InitialSyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java similarity index 70% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/InitialSyncProcessor.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java index e918368c..80f9c670 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/InitialSyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; public interface InitialSyncProcessor { void prepareForInitialSync(PeerId from, JObjectKey key); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemoteDto.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java similarity index 70% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemoteDto.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java index c2dd0b33..58da8e93 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemoteDto.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoMirror; -import com.usatiuk.dhfs.objects.JDataRemote; -import com.usatiuk.dhfs.objects.persistence.JDataRemoteDtoP; +import com.usatiuk.dhfs.JDataRemote; +import com.usatiuk.dhfs.persistence.JDataRemoteDtoP; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemotePush.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java similarity index 85% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemotePush.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java index 567ed036..39616381 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/JDataRemotePush.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/ObjSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java similarity index 74% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/ObjSyncHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java index d935d0f9..e27b575f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/ObjSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.JDataRemote; +import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import org.pcollections.PMap; import javax.annotation.Nullable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerConnectedEventListener.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java similarity index 52% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerConnectedEventListener.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java index 42a8ae28..8d249a4c 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerConnectedEventListener.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; public interface PeerConnectedEventListener { void handlePeerConnected(PeerId peerId); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerDisconnectedEventListener.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java similarity index 54% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerDisconnectedEventListener.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java index 9d0dea2f..47fd966f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerDisconnectedEventListener.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; public interface PeerDisconnectedEventListener { void handlePeerDisconnected(PeerId peerId); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java similarity index 92% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java index da3ba9c2..2334b2f1 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PeerManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java @@ -1,13 +1,13 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; -import com.usatiuk.dhfs.objects.repository.peersync.api.PeerSyncApiClientDynamic; -import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager; -import com.usatiuk.dhfs.objects.repository.webapi.AvailablePeerInfo; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryDirectory; +import com.usatiuk.dhfs.repository.peersync.PeerInfo; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java index bb368f7e..052f6d78 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.ShutdownChecker; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; -import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentRemoteHostsData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java similarity index 92% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentRemoteHostsData.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java index 5e820e18..baabb3d1 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentRemoteHostsData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import org.pcollections.PSet; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java similarity index 97% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java index 520bffb2..d2806f68 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java @@ -1,10 +1,11 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; +import com.usatiuk.dhfs.*; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; -import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; +import com.usatiuk.dhfs.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 io.grpc.Status; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java similarity index 63% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java index bb388d4b..ca163616 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java @@ -1,24 +1,12 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; -import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; -import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler; -import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService; -import com.usatiuk.dhfs.objects.transaction.Transaction; -import com.usatiuk.dhfs.objects.transaction.TransactionManager; -import io.grpc.Status; -import io.grpc.StatusRuntimeException; +import com.usatiuk.dhfs.PeerId; import io.quarkus.grpc.GrpcService; -import io.quarkus.logging.Log; import io.quarkus.security.identity.SecurityIdentity; import io.smallrye.common.annotation.Blocking; import io.smallrye.mutiny.Uni; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; -import org.apache.commons.lang3.tuple.Pair; // Note: RunOnVirtualThread hangs somehow @GrpcService @@ -29,7 +17,7 @@ public class RemoteObjectServiceServer implements DhfsObjectSyncGrpc { @Inject RemoteObjectServiceServerImpl remoteObjectServiceServerImpl; - PeerId getIdentity() { + private PeerId getIdentity() { return PeerId.of(identity.getPrincipal().getName().substring(3)); } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServerImpl.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java similarity index 89% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServerImpl.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java index 215cbbad..3548241d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceServerImpl.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java @@ -1,21 +1,18 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; +import com.usatiuk.dhfs.*; import com.usatiuk.dhfs.objects.*; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; -import com.usatiuk.dhfs.objects.repository.invalidation.Op; -import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler; -import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService; +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 io.grpc.Status; import io.grpc.StatusRuntimeException; -import io.quarkus.grpc.GrpcService; import io.quarkus.logging.Log; -import io.quarkus.security.identity.SecurityIdentity; -import io.smallrye.common.annotation.Blocking; import io.smallrye.mutiny.Uni; -import jakarta.annotation.security.RolesAllowed; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.tuple.Pair; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcChannelFactory.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java similarity index 91% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcChannelFactory.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java index a985be13..398e3e12 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcChannelFactory.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager; import io.grpc.ChannelCredentials; import io.grpc.ManagedChannel; import io.grpc.TlsChannelCredentials; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java index ab234a66..24f86755 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress; import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java index 7581db67..58af1e30 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java @@ -1,8 +1,11 @@ -package com.usatiuk.dhfs.objects.repository; +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.dhfs.objects.repository.invalidation.InvalidationQueueService; +import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService; import com.usatiuk.dhfs.objects.transaction.Transaction; import com.usatiuk.dhfs.objects.transaction.TransactionManager; import io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandlerService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java similarity index 71% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandlerService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java index 4e400c2f..647e10cd 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandlerService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHelper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHelper.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java index d18913aa..eea74edc 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHelper.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import org.pcollections.PMap; import java.util.stream.Collectors; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java similarity index 82% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java index cfa10fe9..96edd029 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/TemporaryReceivedObjectSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java @@ -1,11 +1,11 @@ -package com.usatiuk.dhfs.objects.repository; +package com.usatiuk.dhfs.repository; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.ReceivedObject; -import com.usatiuk.dhfs.objects.persistence.JDataRemoteDtoP; -import com.usatiuk.dhfs.objects.persistence.JObjectKeyP; -import com.usatiuk.dhfs.objects.persistence.PeerIdP; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.ReceivedObject; +import com.usatiuk.dhfs.persistence.JDataRemoteDtoP; +import com.usatiuk.dhfs.persistence.JObjectKeyP; +import com.usatiuk.dhfs.persistence.PeerIdP; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.pcollections.HashTreePMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueData.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java similarity index 81% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueData.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java index 65685900..09771790 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueData.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.HashSetValuedHashMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java index de7e9074..0a1bd7f8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/DeferredInvalidationQueueService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.PeerConnectedEventListener; -import com.usatiuk.dhfs.objects.repository.PeerManager; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.PeerConnectedEventListener; +import com.usatiuk.dhfs.repository.PeerManager; import com.usatiuk.dhfs.utils.SerializationHelper; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/IndexUpdateOp.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java similarity index 68% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/IndexUpdateOp.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java index 5d3b18a3..89dafb8b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/IndexUpdateOp.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import org.pcollections.PMap; import java.util.Collection; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueEntry.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java similarity index 63% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueEntry.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java index d8f78211..85d1eed1 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueEntry.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import java.io.Serializable; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java similarity index 95% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java index bb983011..162ae627 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/InvalidationQueueService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java @@ -1,10 +1,10 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.PeerManager; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.PeerManager; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; +import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/Op.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java similarity index 77% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/Op.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java index c0c276d2..28f765b4 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/Op.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.objects.JObjectKey; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java similarity index 76% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java index 7121f308..de001c76 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java @@ -1,9 +1,9 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; -import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeOpWrapper; -import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreePeriodicPushOp; +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 jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java similarity index 86% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java index a762c89e..083265f8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/OpPusher.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java @@ -1,14 +1,14 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; import com.usatiuk.dhfs.objects.JData; -import com.usatiuk.dhfs.objects.RemoteObjectMeta; -import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; -import com.usatiuk.dhfs.objects.repository.JDataRemotePush; -import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient; -import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService; +import com.usatiuk.dhfs.RemoteObjectMeta; +import com.usatiuk.dhfs.RemoteTransaction; +import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/PushOpHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java similarity index 69% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/PushOpHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java index f31cfa04..3ca1800a 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/invalidation/PushOpHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository.invalidation; +package com.usatiuk.dhfs.repository.invalidation; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.repository.SyncHandler; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.RemoteTransaction; +import com.usatiuk.dhfs.repository.SyncHandler; import com.usatiuk.dhfs.objects.transaction.Transaction; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/IpPeerAddress.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java similarity index 66% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/IpPeerAddress.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java index 0d6ab1da..a867ca39 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/IpPeerAddress.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery; +package com.usatiuk.dhfs.repository.peerdiscovery; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import java.net.InetAddress; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java new file mode 100644 index 00000000..9339c4c8 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java @@ -0,0 +1,9 @@ +package com.usatiuk.dhfs.repository.peerdiscovery; + +import com.usatiuk.dhfs.PeerId; + +public interface PeerAddress { + PeerId peer(); + + PeerAddressType type(); +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddressType.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java similarity index 50% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddressType.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java index b5027e4b..9511c8db 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddressType.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery; +package com.usatiuk.dhfs.repository.peerdiscovery; public enum PeerAddressType { LAN, diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerDiscoveryDirectory.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java similarity index 96% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerDiscoveryDirectory.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java index b365b725..715287f8 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerDiscoveryDirectory.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery; +package com.usatiuk.dhfs.repository.peerdiscovery; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import org.apache.commons.collections4.MultiValuedMap; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/StaticPeerDiscovery.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/StaticPeerDiscovery.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java index 1dcedce3..b183bda6 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/StaticPeerDiscovery.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery; +package com.usatiuk.dhfs.repository.peerdiscovery; -import com.usatiuk.dhfs.objects.PeerId; +import com.usatiuk.dhfs.PeerId; import io.quarkus.scheduler.Scheduled; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java similarity index 94% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java index 7b8362f5..eae33e82 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery.local; +package com.usatiuk.dhfs.repository.peerdiscovery.local; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryInfo; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryInfo; import io.quarkus.arc.properties.IfBuildProperty; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java similarity index 87% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java index 7e818c1d..e61edb0f 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java @@ -1,11 +1,11 @@ -package com.usatiuk.dhfs.objects.repository.peerdiscovery.local; +package com.usatiuk.dhfs.repository.peerdiscovery.local; import com.google.protobuf.InvalidProtocolBufferException; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddressType; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryInfo; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddressType; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryDirectory; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryInfo; import io.quarkus.arc.properties.IfBuildProperty; import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java similarity index 67% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfo.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java index e4a25a9a..1934c617 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfo.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java @@ -1,12 +1,12 @@ -package com.usatiuk.dhfs.objects.repository.peersync; +package com.usatiuk.dhfs.repository.peersync; import com.google.protobuf.ByteString; -import com.usatiuk.dhfs.objects.JDataRemote; +import com.usatiuk.dhfs.JDataRemote; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.CertificateTools; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; -import com.usatiuk.dhfs.objects.repository.JDataRemotePush; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.CertificateTools; +import com.usatiuk.dhfs.repository.JDataRemoteDto; +import com.usatiuk.dhfs.repository.JDataRemotePush; import java.security.cert.X509Certificate; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoProtoSerializer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java similarity index 86% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoProtoSerializer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java index 1475f340..76bf2685 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoProtoSerializer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peersync; +package com.usatiuk.dhfs.repository.peersync; import com.usatiuk.autoprotomap.runtime.ProtoSerializer; -import com.usatiuk.dhfs.objects.persistence.PeerInfoP; +import com.usatiuk.dhfs.persistence.PeerInfoP; import com.usatiuk.dhfs.utils.SerializationHelper; import jakarta.inject.Singleton; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java similarity index 91% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java index c8c13e9c..b75671f0 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java @@ -1,12 +1,12 @@ -package com.usatiuk.dhfs.objects.repository.peersync; +package com.usatiuk.dhfs.repository.peersync; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.RemoteTransaction; -import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; +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; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoSyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoSyncHandler.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java index d464e5ba..45bbaa44 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PeerInfoSyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java @@ -1,9 +1,13 @@ -package com.usatiuk.dhfs.objects.repository.peersync; +package com.usatiuk.dhfs.repository.peersync; +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.objects.repository.ObjSyncHandler; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.SyncHelper; +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 io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/ApiPeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java similarity index 51% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/ApiPeerInfo.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java index e84f4d83..63a7d000 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/ApiPeerInfo.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository.peersync.api; +package com.usatiuk.dhfs.repository.peersync.api; public record ApiPeerInfo(String selfUuid, String cert) { } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApi.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java similarity index 84% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApi.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java index f3d07189..64dfb9e5 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApi.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java @@ -1,6 +1,6 @@ -package com.usatiuk.dhfs.objects.repository.peersync.api; +package com.usatiuk.dhfs.repository.peersync.api; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java similarity index 74% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClient.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java index 49a04ac6..1d650d49 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClient.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java @@ -1,4 +1,4 @@ -package com.usatiuk.dhfs.objects.repository.peersync.api; +package com.usatiuk.dhfs.repository.peersync.api; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClientDynamic.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java similarity index 82% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClientDynamic.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java index c09262e9..2c9f6cf3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/api/PeerSyncApiClientDynamic.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peersync.api; +package com.usatiuk.dhfs.repository.peersync.api; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress; -import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress; +import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress; +import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress; import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; import jakarta.enterprise.context.ApplicationScoped; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java similarity index 89% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java index fd693227..151ac6ae 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository.peersync.structs; +package com.usatiuk.dhfs.repository.peersync.structs; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta; import java.util.Objects; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerInfoCertUpdateTxHook.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java similarity index 84% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerInfoCertUpdateTxHook.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java index 849379a6..55d8527e 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerInfoCertUpdateTxHook.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java @@ -1,14 +1,14 @@ -package com.usatiuk.dhfs.objects.repository.peertrust; +package com.usatiuk.dhfs.repository.peertrust; import com.usatiuk.dhfs.objects.JData; import com.usatiuk.dhfs.objects.JObjectKey; -import com.usatiuk.dhfs.objects.RemoteObjectDataWrapper; -import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; -import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; -import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer; +import com.usatiuk.dhfs.RemoteObjectDataWrapper; +import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; +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 io.quarkus.logging.Log; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerRolesAugmentor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java similarity index 91% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerRolesAugmentor.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java index d2e1c4bf..02698733 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerRolesAugmentor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peertrust; +package com.usatiuk.dhfs.repository.peertrust; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import io.quarkus.logging.Log; import io.quarkus.security.credential.CertificateCredential; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustManager.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java index e1a51044..ea7fe1dc 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peertrust; +package com.usatiuk.dhfs.repository.peertrust; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.repository.peersync.PeerInfo; +import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import io.quarkus.logging.Log; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustServerCustomizer.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java similarity index 92% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustServerCustomizer.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java index 167465f6..cf7531db 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peertrust/PeerTrustServerCustomizer.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.peertrust; +package com.usatiuk.dhfs.repository.peertrust; -import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService; +import com.usatiuk.dhfs.repository.PersistentPeerDataService; import io.quarkus.vertx.http.HttpServerOptionsCustomizer; import io.vertx.core.http.HttpServerOptions; import io.vertx.core.net.KeyCertOptions; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java new file mode 100644 index 00000000..27fe75a3 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java @@ -0,0 +1,10 @@ +package com.usatiuk.dhfs.repository.syncmap; + +import com.usatiuk.dhfs.JDataRemote; +import com.usatiuk.dhfs.repository.JDataRemoteDto; + +public interface DtoMapper { + D toDto(F obj); + + F fromDto(D dto); +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapperService.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java similarity index 93% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapperService.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java index 0165bb43..df8733dc 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapperService.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java @@ -1,7 +1,7 @@ -package com.usatiuk.dhfs.objects.repository.syncmap; +package com.usatiuk.dhfs.repository.syncmap; -import com.usatiuk.dhfs.objects.JDataRemote; -import com.usatiuk.dhfs.objects.repository.JDataRemoteDto; +import com.usatiuk.dhfs.JDataRemote; +import com.usatiuk.dhfs.repository.JDataRemoteDto; import jakarta.enterprise.inject.Instance; import jakarta.inject.Singleton; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/AvailablePeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/AvailablePeerInfo.java new file mode 100644 index 00000000..14b4a317 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/AvailablePeerInfo.java @@ -0,0 +1,4 @@ +package com.usatiuk.dhfs.repository.webapi; + +public record AvailablePeerInfo(String uuid) { +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java new file mode 100644 index 00000000..315bcc81 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java @@ -0,0 +1,4 @@ +package com.usatiuk.dhfs.repository.webapi; + +public record KnownPeerDelete(String uuid) { +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java new file mode 100644 index 00000000..6700fc78 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java @@ -0,0 +1,4 @@ +package com.usatiuk.dhfs.repository.webapi; + +public record KnownPeerInfo(String uuid) { +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java new file mode 100644 index 00000000..57fa1b15 --- /dev/null +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java @@ -0,0 +1,4 @@ +package com.usatiuk.dhfs.repository.webapi; + +public record KnownPeerPut(String uuid) { +} diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/ManagementApi.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/ManagementApi.java similarity index 82% rename from dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/ManagementApi.java rename to dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/ManagementApi.java index 43c1aa88..6ae15927 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/ManagementApi.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/webapi/ManagementApi.java @@ -1,8 +1,8 @@ -package com.usatiuk.dhfs.objects.repository.webapi; +package com.usatiuk.dhfs.repository.webapi; -import com.usatiuk.dhfs.objects.PeerId; -import com.usatiuk.dhfs.objects.repository.PeerManager; -import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService; +import com.usatiuk.dhfs.PeerId; +import com.usatiuk.dhfs.repository.PeerManager; +import com.usatiuk.dhfs.repository.peersync.PeerInfoService; import jakarta.inject.Inject; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto b/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto index a1bc1866..d6880dea 100644 --- a/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto +++ b/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.usatiuk.dhfs.objects.repository.peerdiscovery"; +option java_package = "com.usatiuk.dhfs.repository.peerdiscovery"; option java_outer_classname = "DhfsObjectPeerDiscoveryApi"; package dhfs.objects.peerdiscovery; diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto b/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto index 3e1a13d9..9792f177 100644 --- a/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto +++ b/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.usatiuk.dhfs.objects.persistence"; +option java_package = "com.usatiuk.dhfs.persistence"; option java_outer_classname = "DhfsObjectPersistence"; package dhfs.objects.persistence; diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto b/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto index fd6e4167..91cda667 100644 --- a/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto +++ b/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto @@ -3,7 +3,7 @@ syntax = "proto3"; import "dhfs_objects_serial.proto"; option java_multiple_files = true; -option java_package = "com.usatiuk.dhfs.objects.repository"; +option java_package = "com.usatiuk.dhfs.repository"; option java_outer_classname = "DhfsObjectSyncApi"; package dhfs.objects.sync; 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 b3683ce0..b41b64e9 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,6 +1,5 @@ package com.usatiuk.dhfs; -import com.usatiuk.dhfs.objects.JDataRef; import com.usatiuk.dhfs.objects.JObjectKey; import com.usatiuk.dhfs.objects.testobjs.TestRefcount; import com.usatiuk.dhfs.objects.transaction.Transaction; 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 b8e75b6f..95309c47 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 @@ -3,7 +3,7 @@ package com.usatiuk.dhfs.files; import com.usatiuk.dhfs.TempDataProfile; import com.usatiuk.dhfs.files.objects.File; import com.usatiuk.dhfs.files.service.DhfsFileService; -import com.usatiuk.dhfs.objects.RemoteTransaction; +import com.usatiuk.dhfs.RemoteTransaction; import com.usatiuk.dhfs.objects.transaction.Transaction; import com.usatiuk.dhfs.objects.transaction.TransactionManager; import com.usatiuk.kleppmanntree.AlreadyExistsException; 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/dhfs/objects/testobjs/TestRefcount.java index dc262d39..f13bdddb 100644 --- a/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/objects/testobjs/TestRefcount.java +++ b/dhfs-parent/server/src/test/java/com/usatiuk/dhfs/objects/testobjs/TestRefcount.java @@ -1,7 +1,7 @@ package com.usatiuk.dhfs.objects.testobjs; -import com.usatiuk.dhfs.objects.JDataRef; -import com.usatiuk.dhfs.objects.JDataRefcounted; +import com.usatiuk.dhfs.JDataRef; +import com.usatiuk.dhfs.JDataRefcounted; import com.usatiuk.dhfs.objects.JObjectKey; import org.pcollections.HashTreePSet; import org.pcollections.PCollection;