From c9c7d03c70e10281f00e9967c7549fe30fcd88b3 Mon Sep 17 00:00:00 2001
From: Kevin Herron <kevinherron@gmail.com>
Date: Tue, 30 Dec 2025 08:42:47 -0800
Subject: [PATCH] Refactor package structure to com.digitalpetri.util.byteops

Move classes from com.digitalpetri.util to more specific packages:
- byteops core: com.digitalpetri.util.byteops
- byteops-netty: com.digitalpetri.util.byteops.netty
- byteops-unsigned: com.digitalpetri.util.byteops.unsigned
---
 .../digitalpetri/util/{ => byteops/netty}/ByteBufByteOps.java | 4 +++-
 .../com/digitalpetri/util/byteops/netty}/package-info.java    | 2 +-
 .../util/{ => byteops/netty}/ByteBufByteOpsTest.java          | 4 +++-
 .../util/{ => byteops/unsigned}/UnsignedByteOps.java          | 3 ++-
 .../com/digitalpetri/util/byteops/unsigned}/package-info.java | 2 +-
 .../util/{ => byteops/unsigned}/UnsignedByteOpsTest.java      | 4 +++-
 .../com/digitalpetri/util/{ => byteops}/AbstractByteOps.java  | 2 +-
 .../com/digitalpetri/util/{ => byteops}/ByteArrayByteOps.java | 2 +-
 .../digitalpetri/util/{ => byteops}/ByteBufferByteOps.java    | 2 +-
 .../java/com/digitalpetri/util/{ => byteops}/ByteOps.java     | 2 +-
 .../java/com/digitalpetri/util/{ => byteops}/OrderedOps.java  | 2 +-
 .../java/com/digitalpetri/util/byteops}/package-info.java     | 2 +-
 .../digitalpetri/util/{ => byteops}/AbstractByteOpsTest.java  | 4 ++--
 .../digitalpetri/util/{ => byteops}/ByteArrayByteOpsTest.java | 2 +-
 .../util/{ => byteops}/ByteBufferByteOpsTest.java             | 2 +-
 15 files changed, 23 insertions(+), 16 deletions(-)
 rename byteops-netty/src/main/java/com/digitalpetri/util/{ => byteops/netty}/ByteBufByteOps.java (88%)
 rename {byteops-unsigned/src/main/java/com/digitalpetri/util => byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty}/package-info.java (55%)
 rename byteops-netty/src/test/java/com/digitalpetri/util/{ => byteops/netty}/ByteBufByteOpsTest.java (87%)
 rename byteops-unsigned/src/main/java/com/digitalpetri/util/{ => byteops/unsigned}/UnsignedByteOps.java (99%)
 rename {byteops/src/main/java/com/digitalpetri/util => byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned}/package-info.java (54%)
 rename byteops-unsigned/src/test/java/com/digitalpetri/util/{ => byteops/unsigned}/UnsignedByteOpsTest.java (98%)
 rename byteops/src/main/java/com/digitalpetri/util/{ => byteops}/AbstractByteOps.java (99%)
 rename byteops/src/main/java/com/digitalpetri/util/{ => byteops}/ByteArrayByteOps.java (96%)
 rename byteops/src/main/java/com/digitalpetri/util/{ => byteops}/ByteBufferByteOps.java (97%)
 rename byteops/src/main/java/com/digitalpetri/util/{ => byteops}/ByteOps.java (99%)
 rename byteops/src/main/java/com/digitalpetri/util/{ => byteops}/OrderedOps.java (99%)
 rename {byteops-netty/src/main/java/com/digitalpetri/util => byteops/src/main/java/com/digitalpetri/util/byteops}/package-info.java (59%)
 rename byteops/src/test/java/com/digitalpetri/util/{ => byteops}/AbstractByteOpsTest.java (99%)
 rename byteops/src/test/java/com/digitalpetri/util/{ => byteops}/ByteArrayByteOpsTest.java (96%)
 rename byteops/src/test/java/com/digitalpetri/util/{ => byteops}/ByteBufferByteOpsTest.java (96%)

diff --git a/byteops-netty/src/main/java/com/digitalpetri/util/ByteBufByteOps.java b/byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/ByteBufByteOps.java
similarity index 88%
rename from byteops-netty/src/main/java/com/digitalpetri/util/ByteBufByteOps.java
rename to byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/ByteBufByteOps.java
index f8e1625..9fca6e2 100644
--- a/byteops-netty/src/main/java/com/digitalpetri/util/ByteBufByteOps.java
+++ b/byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/ByteBufByteOps.java
@@ -1,5 +1,7 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.netty;
 
+import com.digitalpetri.util.byteops.AbstractByteOps;
+import com.digitalpetri.util.byteops.OrderedOps;
 import io.netty.buffer.ByteBuf;
 
 public final class ByteBufByteOps extends AbstractByteOps<ByteBuf> {
diff --git a/byteops-unsigned/src/main/java/com/digitalpetri/util/package-info.java b/byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/package-info.java
similarity index 55%
rename from byteops-unsigned/src/main/java/com/digitalpetri/util/package-info.java
rename to byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/package-info.java
index 747c10d..ca96a3c 100644
--- a/byteops-unsigned/src/main/java/com/digitalpetri/util/package-info.java
+++ b/byteops-netty/src/main/java/com/digitalpetri/util/byteops/netty/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.netty;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/byteops-netty/src/test/java/com/digitalpetri/util/ByteBufByteOpsTest.java b/byteops-netty/src/test/java/com/digitalpetri/util/byteops/netty/ByteBufByteOpsTest.java
similarity index 87%
rename from byteops-netty/src/test/java/com/digitalpetri/util/ByteBufByteOpsTest.java
rename to byteops-netty/src/test/java/com/digitalpetri/util/byteops/netty/ByteBufByteOpsTest.java
index 38be008..a899444 100644
--- a/byteops-netty/src/test/java/com/digitalpetri/util/ByteBufByteOpsTest.java
+++ b/byteops-netty/src/test/java/com/digitalpetri/util/byteops/netty/ByteBufByteOpsTest.java
@@ -1,5 +1,7 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.netty;
 
+import com.digitalpetri.util.byteops.AbstractByteOpsTest;
+import com.digitalpetri.util.byteops.ByteOps;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.nio.ByteOrder;
diff --git a/byteops-unsigned/src/main/java/com/digitalpetri/util/UnsignedByteOps.java b/byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOps.java
similarity index 99%
rename from byteops-unsigned/src/main/java/com/digitalpetri/util/UnsignedByteOps.java
rename to byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOps.java
index 2443917..7ee4327 100644
--- a/byteops-unsigned/src/main/java/com/digitalpetri/util/UnsignedByteOps.java
+++ b/byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOps.java
@@ -1,5 +1,6 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.unsigned;
 
+import com.digitalpetri.util.byteops.ByteOps;
 import org.joou.UByte;
 import org.joou.UInteger;
 import org.joou.ULong;
diff --git a/byteops/src/main/java/com/digitalpetri/util/package-info.java b/byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/package-info.java
similarity index 54%
rename from byteops/src/main/java/com/digitalpetri/util/package-info.java
rename to byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/package-info.java
index 747c10d..b98d598 100644
--- a/byteops/src/main/java/com/digitalpetri/util/package-info.java
+++ b/byteops-unsigned/src/main/java/com/digitalpetri/util/byteops/unsigned/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.unsigned;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/byteops-unsigned/src/test/java/com/digitalpetri/util/UnsignedByteOpsTest.java b/byteops-unsigned/src/test/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOpsTest.java
similarity index 98%
rename from byteops-unsigned/src/test/java/com/digitalpetri/util/UnsignedByteOpsTest.java
rename to byteops-unsigned/src/test/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOpsTest.java
index 7c4acf3..04d2356 100644
--- a/byteops-unsigned/src/test/java/com/digitalpetri/util/UnsignedByteOpsTest.java
+++ b/byteops-unsigned/src/test/java/com/digitalpetri/util/byteops/unsigned/UnsignedByteOpsTest.java
@@ -1,7 +1,9 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops.unsigned;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.digitalpetri.util.byteops.ByteArrayByteOps;
+import com.digitalpetri.util.byteops.ByteOps;
 import org.joou.UByte;
 import org.joou.UInteger;
 import org.joou.ULong;
diff --git a/byteops/src/main/java/com/digitalpetri/util/AbstractByteOps.java b/byteops/src/main/java/com/digitalpetri/util/byteops/AbstractByteOps.java
similarity index 99%
rename from byteops/src/main/java/com/digitalpetri/util/AbstractByteOps.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/AbstractByteOps.java
index eb30cf7..f137c8b 100644
--- a/byteops/src/main/java/com/digitalpetri/util/AbstractByteOps.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/AbstractByteOps.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 public abstract class AbstractByteOps<T> implements ByteOps<T> {
 
diff --git a/byteops/src/main/java/com/digitalpetri/util/ByteArrayByteOps.java b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteArrayByteOps.java
similarity index 96%
rename from byteops/src/main/java/com/digitalpetri/util/ByteArrayByteOps.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/ByteArrayByteOps.java
index 29bdd31..7c65c25 100644
--- a/byteops/src/main/java/com/digitalpetri/util/ByteArrayByteOps.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteArrayByteOps.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 /** {@link ByteOps} implementation that operates on byte arrays. */
 public final class ByteArrayByteOps extends AbstractByteOps<byte[]> {
diff --git a/byteops/src/main/java/com/digitalpetri/util/ByteBufferByteOps.java b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteBufferByteOps.java
similarity index 97%
rename from byteops/src/main/java/com/digitalpetri/util/ByteBufferByteOps.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/ByteBufferByteOps.java
index 945aeec..567e463 100644
--- a/byteops/src/main/java/com/digitalpetri/util/ByteBufferByteOps.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteBufferByteOps.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import java.nio.ByteBuffer;
 
diff --git a/byteops/src/main/java/com/digitalpetri/util/ByteOps.java b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteOps.java
similarity index 99%
rename from byteops/src/main/java/com/digitalpetri/util/ByteOps.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/ByteOps.java
index aaf43f2..d8188e9 100644
--- a/byteops/src/main/java/com/digitalpetri/util/ByteOps.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/ByteOps.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 public interface ByteOps<T> {
 
diff --git a/byteops/src/main/java/com/digitalpetri/util/OrderedOps.java b/byteops/src/main/java/com/digitalpetri/util/byteops/OrderedOps.java
similarity index 99%
rename from byteops/src/main/java/com/digitalpetri/util/OrderedOps.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/OrderedOps.java
index f44bf9d..8416ad8 100644
--- a/byteops/src/main/java/com/digitalpetri/util/OrderedOps.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/OrderedOps.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import java.util.function.BiConsumer;
 import java.util.function.Function;
diff --git a/byteops-netty/src/main/java/com/digitalpetri/util/package-info.java b/byteops/src/main/java/com/digitalpetri/util/byteops/package-info.java
similarity index 59%
rename from byteops-netty/src/main/java/com/digitalpetri/util/package-info.java
rename to byteops/src/main/java/com/digitalpetri/util/byteops/package-info.java
index 747c10d..792b536 100644
--- a/byteops-netty/src/main/java/com/digitalpetri/util/package-info.java
+++ b/byteops/src/main/java/com/digitalpetri/util/byteops/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/byteops/src/test/java/com/digitalpetri/util/AbstractByteOpsTest.java b/byteops/src/test/java/com/digitalpetri/util/byteops/AbstractByteOpsTest.java
similarity index 99%
rename from byteops/src/test/java/com/digitalpetri/util/AbstractByteOpsTest.java
rename to byteops/src/test/java/com/digitalpetri/util/byteops/AbstractByteOpsTest.java
index 09c21f8..48605d1 100644
--- a/byteops/src/test/java/com/digitalpetri/util/AbstractByteOpsTest.java
+++ b/byteops/src/test/java/com/digitalpetri/util/byteops/AbstractByteOpsTest.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-abstract class AbstractByteOpsTest<T> {
+public abstract class AbstractByteOpsTest<T> {
 
   protected abstract T getBytes(byte[] bs);
 
diff --git a/byteops/src/test/java/com/digitalpetri/util/ByteArrayByteOpsTest.java b/byteops/src/test/java/com/digitalpetri/util/byteops/ByteArrayByteOpsTest.java
similarity index 96%
rename from byteops/src/test/java/com/digitalpetri/util/ByteArrayByteOpsTest.java
rename to byteops/src/test/java/com/digitalpetri/util/byteops/ByteArrayByteOpsTest.java
index 598aacb..830c3bf 100644
--- a/byteops/src/test/java/com/digitalpetri/util/ByteArrayByteOpsTest.java
+++ b/byteops/src/test/java/com/digitalpetri/util/byteops/ByteArrayByteOpsTest.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
diff --git a/byteops/src/test/java/com/digitalpetri/util/ByteBufferByteOpsTest.java b/byteops/src/test/java/com/digitalpetri/util/byteops/ByteBufferByteOpsTest.java
similarity index 96%
rename from byteops/src/test/java/com/digitalpetri/util/ByteBufferByteOpsTest.java
rename to byteops/src/test/java/com/digitalpetri/util/byteops/ByteBufferByteOpsTest.java
index ac82b58..3639796 100644
--- a/byteops/src/test/java/com/digitalpetri/util/ByteBufferByteOpsTest.java
+++ b/byteops/src/test/java/com/digitalpetri/util/byteops/ByteBufferByteOpsTest.java
@@ -1,4 +1,4 @@
-package com.digitalpetri.util;
+package com.digitalpetri.util.byteops;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;