fix: refactor remove classes to a separate package for parity

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Aug 11, 2024 · dd1c67b · dd1c67b
1 parent f286eed
commit dd1c67b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/...ersistence/storage/BlockAsDirRemover.java → ...nce/storage/remove/BlockAsDirRemover.java b/...ersistence/storage/BlockAsDirRemover.java → ...nce/storage/remove/BlockAsDirRemover.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hedera.block.server.persistence.storage;
+package com.hedera.block.server.persistence.storage.remove;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;

diff --git a/...ver/persistence/storage/BlockRemover.java → ...sistence/storage/remove/BlockRemover.java b/...ver/persistence/storage/BlockRemover.java → ...sistence/storage/remove/BlockRemover.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hedera.block.server.persistence.storage;
+package com.hedera.block.server.persistence.storage.remove;
 
 import java.io.IOException;
 

diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java
@@ -22,7 +22,7 @@
 
 import com.hedera.block.server.config.BlockNodeContext;
 import com.hedera.block.server.metrics.MetricsService;
-import com.hedera.block.server.persistence.storage.BlockRemover;
+import com.hedera.block.server.persistence.storage.remove.BlockRemover;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.helidon.config.Config;
 import java.io.FileOutputStream;

diff --git a/.../main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterBuilder.java b/.../main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterBuilder.java
@@ -19,9 +19,9 @@
 import static com.hedera.block.protos.BlockStreamService.BlockItem;
 
 import com.hedera.block.server.config.BlockNodeContext;
-import com.hedera.block.server.persistence.storage.BlockAsDirRemover;
-import com.hedera.block.server.persistence.storage.BlockRemover;
 import com.hedera.block.server.persistence.storage.Util;
+import com.hedera.block.server.persistence.storage.remove.BlockAsDirRemover;
+import com.hedera.block.server.persistence.storage.remove.BlockRemover;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.helidon.config.Config;
 import java.io.IOException;

diff --git a/server/src/test/java/com/hedera/block/server/BlockStreamServiceIT.java b/server/src/test/java/com/hedera/block/server/BlockStreamServiceIT.java
@@ -27,11 +27,11 @@
 import com.hedera.block.server.data.ObjectEvent;
 import com.hedera.block.server.mediator.LiveStreamMediatorBuilder;
 import com.hedera.block.server.mediator.StreamMediator;
-import com.hedera.block.server.persistence.storage.BlockAsDirRemover;
-import com.hedera.block.server.persistence.storage.BlockRemover;
 import com.hedera.block.server.persistence.storage.Util;
 import com.hedera.block.server.persistence.storage.read.BlockAsDirReaderBuilder;
 import com.hedera.block.server.persistence.storage.read.BlockReader;
+import com.hedera.block.server.persistence.storage.remove.BlockAsDirRemover;
+import com.hedera.block.server.persistence.storage.remove.BlockRemover;
 import com.hedera.block.server.persistence.storage.write.BlockAsDirWriterBuilder;
 import com.hedera.block.server.persistence.storage.write.BlockWriter;
 import com.hedera.block.server.producer.ItemAckBuilder;

diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/BlockAsDirRemoverTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/BlockAsDirRemoverTest.java
@@ -24,6 +24,8 @@
 import com.hedera.block.server.config.BlockNodeContextFactory;
 import com.hedera.block.server.persistence.storage.read.BlockAsDirReaderBuilder;
 import com.hedera.block.server.persistence.storage.read.BlockReader;
+import com.hedera.block.server.persistence.storage.remove.BlockAsDirRemover;
+import com.hedera.block.server.persistence.storage.remove.BlockRemover;
 import com.hedera.block.server.persistence.storage.write.BlockAsDirWriterBuilder;
 import com.hedera.block.server.persistence.storage.write.BlockWriter;
 import com.hedera.block.server.util.PersistTestUtils;

diff --git a/...src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterTest.java b/...src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterTest.java
@@ -24,11 +24,11 @@
 
 import com.hedera.block.server.config.BlockNodeContext;
 import com.hedera.block.server.config.BlockNodeContextFactory;
-import com.hedera.block.server.persistence.storage.BlockAsDirRemover;
-import com.hedera.block.server.persistence.storage.BlockRemover;
 import com.hedera.block.server.persistence.storage.Util;
 import com.hedera.block.server.persistence.storage.read.BlockAsDirReaderBuilder;
 import com.hedera.block.server.persistence.storage.read.BlockReader;
+import com.hedera.block.server.persistence.storage.remove.BlockAsDirRemover;
+import com.hedera.block.server.persistence.storage.remove.BlockRemover;
 import com.hedera.block.server.util.PersistTestUtils;
 import com.hedera.block.server.util.TestUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;