From 3efa93841e1299ae5f16922491b72a7ccef2360b Mon Sep 17 00:00:00 2001
From: Chris Vest <christianvest_hansen@apple.com>
Date: Tue, 17 Nov 2020 15:38:11 +0100
Subject: [PATCH] Rename the 'b2' package to 'api'

---
 .../netty/buffer/{b2 => api}/Allocator.java   |  2 +-
 .../buffer/{b2 => api}/AllocatorControl.java  |  2 +-
 .../java/io/netty/buffer/{b2 => api}/Buf.java |  2 +-
 .../buffer/{b2 => api}/BufAccessors.java      |  2 +-
 .../buffer/{b2 => api}/ByteIterator.java      |  2 +-
 .../buffer/{b2 => api}/CompositeBuf.java      |  5 +--
 .../io/netty/buffer/{b2 => api}/Drop.java     |  2 +-
 .../buffer/{b2 => api}/ManagedAllocator.java  |  4 +--
 .../netty/buffer/{b2 => api}/MemSegBuf.java   |  2 +-
 .../buffer/{b2 => api}/MemoryManager.java     |  5 +--
 .../{b2 => api}/NativeMemoryCleanerDrop.java  |  6 ++--
 .../io/netty/buffer/{b2 => api}/Owned.java    |  2 +-
 .../java/io/netty/buffer/{b2 => api}/Rc.java  |  2 +-
 .../netty/buffer/{b2 => api}/RcSupport.java   |  2 +-
 .../ResourceDisposeFailedException.java       |  2 +-
 .../io/netty/buffer/{b2 => api}/Scope.java    |  2 +-
 .../io/netty/buffer/{b2 => api}/Send.java     |  2 +-
 .../{b2 => api}/SizeClassedMemoryPool.java    |  4 +--
 .../io/netty/buffer/{b2 => api}/Statics.java  |  2 +-
 .../buffer/{b2 => api}/TransferSend.java      |  4 +--
 .../buffer/{b2 => api}/package-info.java      |  2 +-
 .../io/netty/buffer/{b2 => api}/BufTest.java  | 31 ++++++++-----------
 .../io/netty/buffer/{b2 => api}/Fixture.java  |  2 +-
 .../{b2 => api}/MemSegBufAccessBenchmark.java |  2 +-
 .../netty/buffer/{b2 => api}/ScopeTest.java   |  2 +-
 25 files changed, 46 insertions(+), 49 deletions(-)
 rename src/main/java/io/netty/buffer/{b2 => api}/Allocator.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/AllocatorControl.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Buf.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/BufAccessors.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/ByteIterator.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/CompositeBuf.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Drop.java (97%)
 rename src/main/java/io/netty/buffer/{b2 => api}/ManagedAllocator.java (94%)
 rename src/main/java/io/netty/buffer/{b2 => api}/MemSegBuf.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/MemoryManager.java (95%)
 rename src/main/java/io/netty/buffer/{b2 => api}/NativeMemoryCleanerDrop.java (95%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Owned.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Rc.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/RcSupport.java (99%)
 rename src/main/java/io/netty/buffer/{b2 => api}/ResourceDisposeFailedException.java (96%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Scope.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Send.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/SizeClassedMemoryPool.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/Statics.java (98%)
 rename src/main/java/io/netty/buffer/{b2 => api}/TransferSend.java (95%)
 rename src/main/java/io/netty/buffer/{b2 => api}/package-info.java (96%)
 rename src/test/java/io/netty/buffer/{b2 => api}/BufTest.java (99%)
 rename src/test/java/io/netty/buffer/{b2 => api}/Fixture.java (98%)
 rename src/test/java/io/netty/buffer/{b2 => api}/MemSegBufAccessBenchmark.java (99%)
 rename src/test/java/io/netty/buffer/{b2 => api}/ScopeTest.java (98%)

diff --git a/src/main/java/io/netty/buffer/b2/Allocator.java b/src/main/java/io/netty/buffer/api/Allocator.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/Allocator.java
rename to src/main/java/io/netty/buffer/api/Allocator.java
index 9eb9f9f..e0e81bc 100644
--- a/src/main/java/io/netty/buffer/b2/Allocator.java
+++ b/src/main/java/io/netty/buffer/api/Allocator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.nio.ByteOrder;
 
diff --git a/src/main/java/io/netty/buffer/b2/AllocatorControl.java b/src/main/java/io/netty/buffer/api/AllocatorControl.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/AllocatorControl.java
rename to src/main/java/io/netty/buffer/api/AllocatorControl.java
index 778da62..25aa6f6 100644
--- a/src/main/java/io/netty/buffer/b2/AllocatorControl.java
+++ b/src/main/java/io/netty/buffer/api/AllocatorControl.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * Methods for accessing and controlling the internals of an allocator.
diff --git a/src/main/java/io/netty/buffer/b2/Buf.java b/src/main/java/io/netty/buffer/api/Buf.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/Buf.java
rename to src/main/java/io/netty/buffer/api/Buf.java
index 7230d77..152f15b 100644
--- a/src/main/java/io/netty/buffer/b2/Buf.java
+++ b/src/main/java/io/netty/buffer/api/Buf.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/io/netty/buffer/b2/BufAccessors.java b/src/main/java/io/netty/buffer/api/BufAccessors.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/BufAccessors.java
rename to src/main/java/io/netty/buffer/api/BufAccessors.java
index 56d3d11..4a20764 100644
--- a/src/main/java/io/netty/buffer/b2/BufAccessors.java
+++ b/src/main/java/io/netty/buffer/api/BufAccessors.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * This interface is just the primitive data accessor methods that {@link Buf} exposes.
diff --git a/src/main/java/io/netty/buffer/b2/ByteIterator.java b/src/main/java/io/netty/buffer/api/ByteIterator.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/ByteIterator.java
rename to src/main/java/io/netty/buffer/api/ByteIterator.java
index a225e41..dbf40c0 100644
--- a/src/main/java/io/netty/buffer/b2/ByteIterator.java
+++ b/src/main/java/io/netty/buffer/api/ByteIterator.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import io.netty.util.ByteProcessor;
 
diff --git a/src/main/java/io/netty/buffer/b2/CompositeBuf.java b/src/main/java/io/netty/buffer/api/CompositeBuf.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/CompositeBuf.java
rename to src/main/java/io/netty/buffer/api/CompositeBuf.java
index 5da3681..73b5c82 100644
--- a/src/main/java/io/netty/buffer/b2/CompositeBuf.java
+++ b/src/main/java/io/netty/buffer/api/CompositeBuf.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -27,7 +27,8 @@ final class CompositeBuf extends RcSupport<Buf, CompositeBuf> implements Buf {
      * non-composite copy of the buffer.
      */
     private static final int MAX_CAPACITY = Integer.MAX_VALUE - 8;
-    private static final Drop<CompositeBuf> COMPOSITE_DROP = new Drop<CompositeBuf>() {
+    private static final Drop<CompositeBuf>
+            COMPOSITE_DROP = new Drop<CompositeBuf>() {
         @Override
         public void drop(CompositeBuf obj) {
             for (Buf buf : obj.bufs) {
diff --git a/src/main/java/io/netty/buffer/b2/Drop.java b/src/main/java/io/netty/buffer/api/Drop.java
similarity index 97%
rename from src/main/java/io/netty/buffer/b2/Drop.java
rename to src/main/java/io/netty/buffer/api/Drop.java
index e526720..21fde57 100644
--- a/src/main/java/io/netty/buffer/b2/Drop.java
+++ b/src/main/java/io/netty/buffer/api/Drop.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/io/netty/buffer/b2/ManagedAllocator.java b/src/main/java/io/netty/buffer/api/ManagedAllocator.java
similarity index 94%
rename from src/main/java/io/netty/buffer/b2/ManagedAllocator.java
rename to src/main/java/io/netty/buffer/api/ManagedAllocator.java
index 66f2173..5ae231c 100644
--- a/src/main/java/io/netty/buffer/b2/ManagedAllocator.java
+++ b/src/main/java/io/netty/buffer/api/ManagedAllocator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.lang.ref.Cleaner;
 
-import static io.netty.buffer.b2.Statics.NO_OP_DROP;
+import static io.netty.buffer.api.Statics.NO_OP_DROP;
 
 class ManagedAllocator implements Allocator, AllocatorControl {
     private final MemoryManager manager;
diff --git a/src/main/java/io/netty/buffer/b2/MemSegBuf.java b/src/main/java/io/netty/buffer/api/MemSegBuf.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/MemSegBuf.java
rename to src/main/java/io/netty/buffer/api/MemSegBuf.java
index ecdc611..c34f77b 100644
--- a/src/main/java/io/netty/buffer/b2/MemSegBuf.java
+++ b/src/main/java/io/netty/buffer/api/MemSegBuf.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import jdk.incubator.foreign.MemorySegment;
 
diff --git a/src/main/java/io/netty/buffer/b2/MemoryManager.java b/src/main/java/io/netty/buffer/api/MemoryManager.java
similarity index 95%
rename from src/main/java/io/netty/buffer/b2/MemoryManager.java
rename to src/main/java/io/netty/buffer/api/MemoryManager.java
index 6494dc4..9bb7c1e 100644
--- a/src/main/java/io/netty/buffer/b2/MemoryManager.java
+++ b/src/main/java/io/netty/buffer/api/MemoryManager.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
+import io.netty.buffer.api.MemSegBuf.RecoverableMemory;
 import jdk.incubator.foreign.MemorySegment;
 
 import java.lang.ref.Cleaner;
@@ -72,7 +73,7 @@ public interface MemoryManager {
 
         @Override
         public Buf recoverMemory(Object recoverableMemory, Drop<Buf> drop) {
-            var recovery = (MemSegBuf.RecoverableMemory) recoverableMemory;
+            var recovery = (RecoverableMemory) recoverableMemory;
             return recovery.recover(convert(drop));
         }
 
diff --git a/src/main/java/io/netty/buffer/b2/NativeMemoryCleanerDrop.java b/src/main/java/io/netty/buffer/api/NativeMemoryCleanerDrop.java
similarity index 95%
rename from src/main/java/io/netty/buffer/b2/NativeMemoryCleanerDrop.java
rename to src/main/java/io/netty/buffer/api/NativeMemoryCleanerDrop.java
index 7147bbf..5e448d2 100644
--- a/src/main/java/io/netty/buffer/b2/NativeMemoryCleanerDrop.java
+++ b/src/main/java/io/netty/buffer/api/NativeMemoryCleanerDrop.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.lang.invoke.VarHandle;
 import java.lang.ref.Cleaner.Cleanable;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static io.netty.buffer.b2.Statics.CLEANER;
-import static io.netty.buffer.b2.Statics.findVarHandle;
+import static io.netty.buffer.api.Statics.CLEANER;
+import static io.netty.buffer.api.Statics.findVarHandle;
 import static java.lang.invoke.MethodHandles.lookup;
 
 class NativeMemoryCleanerDrop implements Drop<Buf> {
diff --git a/src/main/java/io/netty/buffer/b2/Owned.java b/src/main/java/io/netty/buffer/api/Owned.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/Owned.java
rename to src/main/java/io/netty/buffer/api/Owned.java
index 9f41667..9fa7000 100644
--- a/src/main/java/io/netty/buffer/b2/Owned.java
+++ b/src/main/java/io/netty/buffer/api/Owned.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * This interface encapsulates the ownership of an {@link Rc}, and exposes a method that may be used to transfer this
diff --git a/src/main/java/io/netty/buffer/b2/Rc.java b/src/main/java/io/netty/buffer/api/Rc.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/Rc.java
rename to src/main/java/io/netty/buffer/api/Rc.java
index c267555..def5f7d 100644
--- a/src/main/java/io/netty/buffer/b2/Rc.java
+++ b/src/main/java/io/netty/buffer/api/Rc.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * An Rc is a reference counted, thread-confined, resource of sorts. Because these resources are thread-confined, the
diff --git a/src/main/java/io/netty/buffer/b2/RcSupport.java b/src/main/java/io/netty/buffer/api/RcSupport.java
similarity index 99%
rename from src/main/java/io/netty/buffer/b2/RcSupport.java
rename to src/main/java/io/netty/buffer/api/RcSupport.java
index b616619..da678d3 100644
--- a/src/main/java/io/netty/buffer/b2/RcSupport.java
+++ b/src/main/java/io/netty/buffer/api/RcSupport.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 public abstract class RcSupport<I extends Rc<I>, T extends RcSupport<I, T>> implements Rc<I> {
     private int acquires; // Closed if negative.
diff --git a/src/main/java/io/netty/buffer/b2/ResourceDisposeFailedException.java b/src/main/java/io/netty/buffer/api/ResourceDisposeFailedException.java
similarity index 96%
rename from src/main/java/io/netty/buffer/b2/ResourceDisposeFailedException.java
rename to src/main/java/io/netty/buffer/api/ResourceDisposeFailedException.java
index bac0b49..5206af2 100644
--- a/src/main/java/io/netty/buffer/b2/ResourceDisposeFailedException.java
+++ b/src/main/java/io/netty/buffer/api/ResourceDisposeFailedException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * Thrown when resource disposal fails while closing a resource pool.
diff --git a/src/main/java/io/netty/buffer/b2/Scope.java b/src/main/java/io/netty/buffer/api/Scope.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/Scope.java
rename to src/main/java/io/netty/buffer/api/Scope.java
index 0b993af..755b263 100644
--- a/src/main/java/io/netty/buffer/b2/Scope.java
+++ b/src/main/java/io/netty/buffer/api/Scope.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.util.ArrayDeque;
 
diff --git a/src/main/java/io/netty/buffer/b2/Send.java b/src/main/java/io/netty/buffer/api/Send.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/Send.java
rename to src/main/java/io/netty/buffer/api/Send.java
index b50c20d..c752f90 100644
--- a/src/main/java/io/netty/buffer/b2/Send.java
+++ b/src/main/java/io/netty/buffer/api/Send.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 /**
  * A Send object is a temporary holder of an {@link Rc}, used for transferring the ownership of the Rc from one thread
diff --git a/src/main/java/io/netty/buffer/b2/SizeClassedMemoryPool.java b/src/main/java/io/netty/buffer/api/SizeClassedMemoryPool.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/SizeClassedMemoryPool.java
rename to src/main/java/io/netty/buffer/api/SizeClassedMemoryPool.java
index fd6062a..f133b20 100644
--- a/src/main/java/io/netty/buffer/b2/SizeClassedMemoryPool.java
+++ b/src/main/java/io/netty/buffer/api/SizeClassedMemoryPool.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import static io.netty.buffer.b2.Statics.NO_OP_DROP;
+import static io.netty.buffer.api.Statics.NO_OP_DROP;
 import static java.lang.invoke.MethodHandles.lookup;
 
 class SizeClassedMemoryPool implements Allocator, AllocatorControl, Drop<Buf> {
diff --git a/src/main/java/io/netty/buffer/b2/Statics.java b/src/main/java/io/netty/buffer/api/Statics.java
similarity index 98%
rename from src/main/java/io/netty/buffer/b2/Statics.java
rename to src/main/java/io/netty/buffer/api/Statics.java
index f97bc75..88f62c1 100644
--- a/src/main/java/io/netty/buffer/b2/Statics.java
+++ b/src/main/java/io/netty/buffer/api/Statics.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.VarHandle;
diff --git a/src/main/java/io/netty/buffer/b2/TransferSend.java b/src/main/java/io/netty/buffer/api/TransferSend.java
similarity index 95%
rename from src/main/java/io/netty/buffer/b2/TransferSend.java
rename to src/main/java/io/netty/buffer/api/TransferSend.java
index 83360f7..987187b 100644
--- a/src/main/java/io/netty/buffer/b2/TransferSend.java
+++ b/src/main/java/io/netty/buffer/api/TransferSend.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.lang.invoke.VarHandle;
 
-import static io.netty.buffer.b2.Statics.findVarHandle;
+import static io.netty.buffer.api.Statics.findVarHandle;
 import static java.lang.invoke.MethodHandles.lookup;
 
 class TransferSend<I extends Rc<I>, T extends Rc<I>> implements Send<I> {
diff --git a/src/main/java/io/netty/buffer/b2/package-info.java b/src/main/java/io/netty/buffer/api/package-info.java
similarity index 96%
rename from src/main/java/io/netty/buffer/b2/package-info.java
rename to src/main/java/io/netty/buffer/api/package-info.java
index 2e56362..20b2256 100644
--- a/src/main/java/io/netty/buffer/b2/package-info.java
+++ b/src/main/java/io/netty/buffer/api/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Experimental {@code Buf} implementation, based on MemorySegment, as a potential alternative to {@code ByteBuf}.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
diff --git a/src/test/java/io/netty/buffer/b2/BufTest.java b/src/test/java/io/netty/buffer/api/BufTest.java
similarity index 99%
rename from src/test/java/io/netty/buffer/b2/BufTest.java
rename to src/test/java/io/netty/buffer/api/BufTest.java
index 2af63cf..9696b6e 100644
--- a/src/test/java/io/netty/buffer/b2/BufTest.java
+++ b/src/test/java/io/netty/buffer/api/BufTest.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
+import io.netty.buffer.api.Fixture.Properties;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
@@ -40,12 +41,6 @@ import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.Stream.Builder;
 
-import static io.netty.buffer.b2.Fixture.Properties.CLEANER;
-import static io.netty.buffer.b2.Fixture.Properties.COMPOSITE;
-import static io.netty.buffer.b2.Fixture.Properties.DIRECT;
-import static io.netty.buffer.b2.Fixture.Properties.HEAP;
-import static io.netty.buffer.b2.Fixture.Properties.POOLED;
-import static io.netty.buffer.b2.Fixture.Properties.SLICE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -90,12 +85,12 @@ public class BufTest {
             return Arrays.stream(fxs);
         }
         List<Fixture> initFixtures = List.of(
-                new Fixture("heap", Allocator::heap, HEAP),
-                new Fixture("direct", Allocator::direct, DIRECT),
-                new Fixture("directWithCleaner", Allocator::directWithCleaner, DIRECT, CLEANER),
-                new Fixture("pooledHeap", Allocator::pooledHeap, POOLED, HEAP),
-                new Fixture("pooledDirect", Allocator::pooledDirect, POOLED, DIRECT),
-                new Fixture("pooledDirectWithCleaner", Allocator::pooledDirectWithCleaner, POOLED, DIRECT, CLEANER));
+                new Fixture("heap", Allocator::heap, Properties.HEAP),
+                new Fixture("direct", Allocator::direct, Properties.DIRECT),
+                new Fixture("directWithCleaner", Allocator::directWithCleaner, Properties.DIRECT, Properties.CLEANER),
+                new Fixture("pooledHeap", Allocator::pooledHeap, Properties.POOLED, Properties.HEAP),
+                new Fixture("pooledDirect", Allocator::pooledDirect, Properties.POOLED, Properties.DIRECT),
+                new Fixture("pooledDirectWithCleaner", Allocator::pooledDirectWithCleaner, Properties.POOLED, Properties.DIRECT, Properties.CLEANER));
         Builder<Fixture> builder = Stream.builder();
         initFixtures.forEach(builder);
 
@@ -121,7 +116,7 @@ public class BufTest {
                             b.close();
                         }
                     };
-                }, COMPOSITE));
+                }, Properties.COMPOSITE));
             }
         }
 
@@ -144,7 +139,7 @@ public class BufTest {
                     alloc.close();
                 }
             };
-        }, COMPOSITE));
+        }, Properties.COMPOSITE));
 
         for (Fixture fixture : initFixtures) {
             builder.add(new Fixture(fixture + ".ensureWritable", () -> {
@@ -184,7 +179,7 @@ public class BufTest {
                         allocator.close();
                     }
                 };
-            }, COMPOSITE));
+            }, Properties.COMPOSITE));
         }
 
         return builder.build().flatMap(f -> {
@@ -206,7 +201,7 @@ public class BufTest {
                         allocatorBase.close();
                     }
                 };
-            }, SLICE));
+            }, Properties.SLICE));
             andSlices.add(new Fixture(f + ".slice(1, capacity() - 2)", () -> {
                 var allocatorBase = f.get();
                 return new Allocator() {
@@ -222,7 +217,7 @@ public class BufTest {
                         allocatorBase.close();
                     }
                 };
-            }, SLICE));
+            }, Properties.SLICE));
             return andSlices.build();
         });
     }
diff --git a/src/test/java/io/netty/buffer/b2/Fixture.java b/src/test/java/io/netty/buffer/api/Fixture.java
similarity index 98%
rename from src/test/java/io/netty/buffer/b2/Fixture.java
rename to src/test/java/io/netty/buffer/api/Fixture.java
index e1b033c..9bcf4ad 100644
--- a/src/test/java/io/netty/buffer/b2/Fixture.java
+++ b/src/test/java/io/netty/buffer/api/Fixture.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import java.util.Arrays;
 import java.util.EnumSet;
diff --git a/src/test/java/io/netty/buffer/b2/MemSegBufAccessBenchmark.java b/src/test/java/io/netty/buffer/api/MemSegBufAccessBenchmark.java
similarity index 99%
rename from src/test/java/io/netty/buffer/b2/MemSegBufAccessBenchmark.java
rename to src/test/java/io/netty/buffer/api/MemSegBufAccessBenchmark.java
index e6261df..73307fc 100644
--- a/src/test/java/io/netty/buffer/b2/MemSegBufAccessBenchmark.java
+++ b/src/test/java/io/netty/buffer/api/MemSegBufAccessBenchmark.java
@@ -13,7 +13,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
diff --git a/src/test/java/io/netty/buffer/b2/ScopeTest.java b/src/test/java/io/netty/buffer/api/ScopeTest.java
similarity index 98%
rename from src/test/java/io/netty/buffer/b2/ScopeTest.java
rename to src/test/java/io/netty/buffer/api/ScopeTest.java
index 662b8b7..7c5e3b3 100644
--- a/src/test/java/io/netty/buffer/b2/ScopeTest.java
+++ b/src/test/java/io/netty/buffer/api/ScopeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.buffer.b2;
+package io.netty.buffer.api;
 
 import org.junit.Test;