From 07dd86dc5634c8c61a8a36777cd0b545d54c68d6 Mon Sep 17 00:00:00 2001
From: Chris Vest <christianvest_hansen@apple.com>
Date: Tue, 17 Nov 2020 14:09:14 +0100
Subject: [PATCH] Move ByteIterator to collect everything in one package

---
 buffer/src/main/java/io/netty/buffer/b2/Buf.java              | 2 --
 .../src/main/java/io/netty/buffer/b2}/ByteIterator.java       | 4 +++-
 buffer/src/main/java/io/netty/buffer/b2/CompositeBuf.java     | 2 --
 buffer/src/main/java/io/netty/buffer/b2/MemSegBuf.java        | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename {common/src/main/java/io/netty/util => buffer/src/main/java/io/netty/buffer/b2}/ByteIterator.java (98%)

diff --git a/buffer/src/main/java/io/netty/buffer/b2/Buf.java b/buffer/src/main/java/io/netty/buffer/b2/Buf.java
index 5e301e7..25eb7b5 100644
--- a/buffer/src/main/java/io/netty/buffer/b2/Buf.java
+++ b/buffer/src/main/java/io/netty/buffer/b2/Buf.java
@@ -15,8 +15,6 @@
  */
 package io.netty.buffer.b2;
 
-import io.netty.util.ByteIterator;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
diff --git a/common/src/main/java/io/netty/util/ByteIterator.java b/buffer/src/main/java/io/netty/buffer/b2/ByteIterator.java
similarity index 98%
rename from common/src/main/java/io/netty/util/ByteIterator.java
rename to buffer/src/main/java/io/netty/buffer/b2/ByteIterator.java
index 3630374..a225e41 100644
--- a/common/src/main/java/io/netty/util/ByteIterator.java
+++ b/buffer/src/main/java/io/netty/buffer/b2/ByteIterator.java
@@ -12,7 +12,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.netty.util;
+package io.netty.buffer.b2;
+
+import io.netty.util.ByteProcessor;
 
 /**
  * The ByteIterator scans through a sequence of bytes.
diff --git a/buffer/src/main/java/io/netty/buffer/b2/CompositeBuf.java b/buffer/src/main/java/io/netty/buffer/b2/CompositeBuf.java
index 5b84e24..f234e5d 100644
--- a/buffer/src/main/java/io/netty/buffer/b2/CompositeBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/b2/CompositeBuf.java
@@ -15,8 +15,6 @@
  */
 package io.netty.buffer.b2;
 
-import io.netty.util.ByteIterator;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
diff --git a/buffer/src/main/java/io/netty/buffer/b2/MemSegBuf.java b/buffer/src/main/java/io/netty/buffer/b2/MemSegBuf.java
index 165f525..69c3c7b 100644
--- a/buffer/src/main/java/io/netty/buffer/b2/MemSegBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/b2/MemSegBuf.java
@@ -15,7 +15,6 @@
  */
 package io.netty.buffer.b2;
 
-import io.netty.util.ByteIterator;
 import jdk.incubator.foreign.MemorySegment;
 
 import java.nio.ByteBuffer;