From 513cbd717d77d7922e756253cb9ee05c013bcdb8 Mon Sep 17 00:00:00 2001
From: Stepan Usatiuk <stepan@usatiuk.com>
Date: Sat, 5 Apr 2025 20:17:29 +0200
Subject: [PATCH] Server: remove "dhfs.objects" from proto files

---
 ...discovery.proto => dhfs_peer_discovery.proto} |  2 +-
 ...fs_objects_serial.proto => dhfs_serial.proto} |  2 +-
 .../{dhfs_objects_sync.proto => dhfs_sync.proto} | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename dhfs-parent/server/src/main/proto/{dhfs_objects_peer_discovery.proto => dhfs_peer_discovery.proto} (88%)
 rename dhfs-parent/server/src/main/proto/{dhfs_objects_serial.proto => dhfs_serial.proto} (95%)
 rename dhfs-parent/server/src/main/proto/{dhfs_objects_sync.proto => dhfs_sync.proto} (64%)

diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto b/dhfs-parent/server/src/main/proto/dhfs_peer_discovery.proto
similarity index 88%
rename from dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto
rename to dhfs-parent/server/src/main/proto/dhfs_peer_discovery.proto
index d6880dea..4831e31c 100644
--- a/dhfs-parent/server/src/main/proto/dhfs_objects_peer_discovery.proto
+++ b/dhfs-parent/server/src/main/proto/dhfs_peer_discovery.proto
@@ -4,7 +4,7 @@ option java_multiple_files = true;
 option java_package = "com.usatiuk.dhfs.repository.peerdiscovery";
 option java_outer_classname = "DhfsObjectPeerDiscoveryApi";
 
-package dhfs.objects.peerdiscovery;
+package dhfs.peerdiscovery;
 
 message PeerDiscoveryInfo {
   string uuid = 1;
diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto b/dhfs-parent/server/src/main/proto/dhfs_serial.proto
similarity index 95%
rename from dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto
rename to dhfs-parent/server/src/main/proto/dhfs_serial.proto
index 9792f177..ed52684b 100644
--- a/dhfs-parent/server/src/main/proto/dhfs_objects_serial.proto
+++ b/dhfs-parent/server/src/main/proto/dhfs_serial.proto
@@ -4,7 +4,7 @@ option java_multiple_files = true;
 option java_package = "com.usatiuk.dhfs.persistence";
 option java_outer_classname = "DhfsObjectPersistence";
 
-package dhfs.objects.persistence;
+package dhfs.persistence;
 
 message JObjectKeyP {
   string name = 1;
diff --git a/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto b/dhfs-parent/server/src/main/proto/dhfs_sync.proto
similarity index 64%
rename from dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto
rename to dhfs-parent/server/src/main/proto/dhfs_sync.proto
index 91cda667..a4b012e9 100644
--- a/dhfs-parent/server/src/main/proto/dhfs_objects_sync.proto
+++ b/dhfs-parent/server/src/main/proto/dhfs_sync.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-import "dhfs_objects_serial.proto";
+import "dhfs_serial.proto";
 
 option java_multiple_files = true;
 option java_package = "com.usatiuk.dhfs.repository";
 option java_outer_classname = "DhfsObjectSyncApi";
 
-package dhfs.objects.sync;
+package dhfs.sync;
 
 service DhfsObjectSyncGrpc {
   rpc OpPush (OpPushRequest) returns (OpPushReply) {}
@@ -22,22 +22,22 @@ message PingRequest {}
 message PingReply {}
 
 message GetObjectRequest {
-  dhfs.objects.persistence.JObjectKeyP name = 2;
+  dhfs.persistence.JObjectKeyP name = 2;
 }
 
 message GetObjectReply {
-  dhfs.objects.persistence.ObjectChangelog changelog = 5;
-  dhfs.objects.persistence.JDataRemoteDtoP pushedData = 6;
+  dhfs.persistence.ObjectChangelog changelog = 5;
+  dhfs.persistence.JDataRemoteDtoP pushedData = 6;
 }
 
 message CanDeleteRequest {
-  dhfs.objects.persistence.JObjectKeyP name = 2;
-  repeated dhfs.objects.persistence.JObjectKeyP ourReferrers = 3;
+  dhfs.persistence.JObjectKeyP name = 2;
+  repeated dhfs.persistence.JObjectKeyP ourReferrers = 3;
 }
 
 message CanDeleteReply {
   bool deletionCandidate = 2;
-  repeated dhfs.objects.persistence.JObjectKeyP referrers = 3;
+  repeated dhfs.persistence.JObjectKeyP referrers = 3;
 }
 
 message OpPushRequest {