- * import static io.netty.buffer.{@link Unpooled}.*;
+ * import static io.netty5.buffer.{@link Unpooled}.*;
*
* {@link ByteBuf} heapBuffer = buffer(128);
* {@link ByteBuf} directBuffer = directBuffer(256);
diff --git a/buffer/src/main/java/io/netty5/buffer/UnpooledByteBufAllocator.java b/buffer/src/main/java/io/netty5/buffer/UnpooledByteBufAllocator.java
index c3fc8eb48a..b5951574b4 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnpooledByteBufAllocator.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnpooledByteBufAllocator.java
@@ -17,7 +17,6 @@ package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.StringUtil;
-
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.LongAdder;
diff --git a/buffer/src/main/java/io/netty5/buffer/UnpooledDirectByteBuf.java b/buffer/src/main/java/io/netty5/buffer/UnpooledDirectByteBuf.java
index cc18071ac8..d0a626d81e 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnpooledDirectByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnpooledDirectByteBuf.java
@@ -19,7 +19,6 @@ import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.PlatformDependent;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/UnpooledHeapByteBuf.java b/buffer/src/main/java/io/netty5/buffer/UnpooledHeapByteBuf.java
index 5c35c69d19..d7f867289d 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnpooledHeapByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnpooledHeapByteBuf.java
@@ -19,7 +19,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.EmptyArrays;
import io.netty5.util.internal.PlatformDependent;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeDirectByteBuf.java b/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeDirectByteBuf.java
index 37c191c2c2..a76429977e 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeDirectByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeDirectByteBuf.java
@@ -16,7 +16,6 @@
package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java b/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java
index 53ef2f7a52..cc93cb58b2 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java
@@ -16,7 +16,6 @@
package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-
import java.nio.ByteBuffer;
class UnpooledUnsafeNoCleanerDirectByteBuf extends UnpooledUnsafeDirectByteBuf {
diff --git a/buffer/src/main/java/io/netty5/buffer/UnsafeByteBufUtil.java b/buffer/src/main/java/io/netty5/buffer/UnsafeByteBufUtil.java
index 1246d8d4f8..3b453a4ee7 100644
--- a/buffer/src/main/java/io/netty5/buffer/UnsafeByteBufUtil.java
+++ b/buffer/src/main/java/io/netty5/buffer/UnsafeByteBufUtil.java
@@ -15,8 +15,11 @@
*/
package io.netty5.buffer;
-import io.netty5.util.internal.PlatformDependent;
+import static io.netty5.util.internal.MathUtil.isOutOfBounds;
+import static io.netty5.util.internal.PlatformDependent.BIG_ENDIAN_NATIVE_ORDER;
+import static java.util.Objects.requireNonNull;
+import io.netty5.util.internal.PlatformDependent;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -24,10 +27,6 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ReadOnlyBufferException;
-import static io.netty5.util.internal.MathUtil.isOutOfBounds;
-import static io.netty5.util.internal.PlatformDependent.BIG_ENDIAN_NATIVE_ORDER;
-import static java.util.Objects.requireNonNull;
-
/**
* All operations get and set as {@link ByteOrder#BIG_ENDIAN}.
*/
diff --git a/buffer/src/main/java/io/netty5/buffer/WrappedByteBuf.java b/buffer/src/main/java/io/netty5/buffer/WrappedByteBuf.java
index acc35bab8f..bf228ea348 100644
--- a/buffer/src/main/java/io/netty5/buffer/WrappedByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/WrappedByteBuf.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.ByteProcessor;
import io.netty5.util.internal.StringUtil;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/WrappedCompositeByteBuf.java b/buffer/src/main/java/io/netty5/buffer/WrappedCompositeByteBuf.java
index 0026b89626..d7b771dec7 100644
--- a/buffer/src/main/java/io/netty5/buffer/WrappedCompositeByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/WrappedCompositeByteBuf.java
@@ -16,7 +16,6 @@
package io.netty5.buffer;
import io.netty5.util.ByteProcessor;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/WrappedUnpooledUnsafeDirectByteBuf.java b/buffer/src/main/java/io/netty5/buffer/WrappedUnpooledUnsafeDirectByteBuf.java
index eec32f8b56..85f104527d 100644
--- a/buffer/src/main/java/io/netty5/buffer/WrappedUnpooledUnsafeDirectByteBuf.java
+++ b/buffer/src/main/java/io/netty5/buffer/WrappedUnpooledUnsafeDirectByteBuf.java
@@ -16,7 +16,6 @@
package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-
import java.nio.ByteBuffer;
final class WrappedUnpooledUnsafeDirectByteBuf extends UnpooledUnsafeDirectByteBuf {
diff --git a/buffer/src/main/java/io/netty5/buffer/api/BufferAllocator.java b/buffer/src/main/java/io/netty5/buffer/api/BufferAllocator.java
index c9f3fd25fd..259ee96697 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/BufferAllocator.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/BufferAllocator.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api;
import io.netty5.buffer.api.pool.PooledBufferAllocator;
-
import java.util.function.Supplier;
/**
diff --git a/buffer/src/main/java/io/netty5/buffer/api/BufferHolder.java b/buffer/src/main/java/io/netty5/buffer/api/BufferHolder.java
index c88549b8f9..243fd096d6 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/BufferHolder.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/BufferHolder.java
@@ -15,14 +15,13 @@
*/
package io.netty5.buffer.api;
+import static java.lang.invoke.MethodHandles.lookup;
+
import io.netty5.buffer.api.internal.ResourceSupport;
import io.netty5.buffer.api.internal.Statics;
-
import java.lang.invoke.VarHandle;
import java.util.Objects;
-import static java.lang.invoke.MethodHandles.lookup;
-
/**
* The {@link BufferHolder} is an abstract class that simplifies the implementation of objects that themselves contain
* a {@link Buffer} instance.
diff --git a/buffer/src/main/java/io/netty5/buffer/api/CompositeBuffer.java b/buffer/src/main/java/io/netty5/buffer/api/CompositeBuffer.java
index 7bae3b9c93..07e178dde6 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/CompositeBuffer.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/CompositeBuffer.java
@@ -15,9 +15,12 @@
*/
package io.netty5.buffer.api;
+import static io.netty5.buffer.api.internal.Statics.bufferIsClosed;
+import static io.netty5.buffer.api.internal.Statics.bufferIsReadOnly;
+import static java.lang.Math.addExact;
+
import io.netty5.buffer.api.internal.ResourceSupport;
import io.netty5.buffer.api.internal.Statics;
-
import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.util.Arrays;
@@ -27,10 +30,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Stream;
-import static io.netty5.buffer.api.internal.Statics.bufferIsClosed;
-import static io.netty5.buffer.api.internal.Statics.bufferIsReadOnly;
-import static java.lang.Math.addExact;
-
/**
* The {@code CompositeBuffer} is a concrete {@link Buffer} implementation that make a number of other buffers appear
* as one. A composite buffer behaves the same as a normal, non-composite buffer in every way, so you normally don't
diff --git a/buffer/src/main/java/io/netty5/buffer/api/DefaultGlobalBufferAllocator.java b/buffer/src/main/java/io/netty5/buffer/api/DefaultGlobalBufferAllocator.java
index 029e95a3c2..dc92ad0d3b 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/DefaultGlobalBufferAllocator.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/DefaultGlobalBufferAllocator.java
@@ -14,14 +14,6 @@
*/
package io.netty5.buffer.api;
-import io.netty5.util.internal.PlatformDependent;
-import io.netty5.util.internal.SystemPropertyUtil;
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.InternalLoggerFactory;
-
-import java.util.Locale;
-import java.util.function.Supplier;
-
import static io.netty5.buffer.api.BufferAllocator.offHeapPooled;
import static io.netty5.buffer.api.BufferAllocator.offHeapUnpooled;
import static io.netty5.buffer.api.BufferAllocator.onHeapPooled;
@@ -30,6 +22,13 @@ import static io.netty5.util.internal.ObjectUtil.checkNotNullWithIAE;
import static io.netty5.util.internal.PlatformDependent.directBufferPreferred;
import static java.lang.Runtime.getRuntime;
+import io.netty5.util.internal.PlatformDependent;
+import io.netty5.util.internal.SystemPropertyUtil;
+import io.netty5.util.internal.logging.InternalLogger;
+import io.netty5.util.internal.logging.InternalLoggerFactory;
+import java.util.Locale;
+import java.util.function.Supplier;
+
/**
* A {@link BufferAllocator} which is {@link #close() disposed} when the {@link Runtime} is shutdown.
*/
diff --git a/buffer/src/main/java/io/netty5/buffer/api/ManagedBufferAllocator.java b/buffer/src/main/java/io/netty5/buffer/api/ManagedBufferAllocator.java
index 4a6b9df34f..ad80d7e968 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/ManagedBufferAllocator.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/ManagedBufferAllocator.java
@@ -15,13 +15,12 @@
*/
package io.netty5.buffer.api;
-import io.netty5.buffer.api.internal.Statics;
-
-import java.util.function.Supplier;
-
import static io.netty5.buffer.api.internal.Statics.NO_OP_DROP;
import static io.netty5.buffer.api.internal.Statics.allocatorClosedException;
+import io.netty5.buffer.api.internal.Statics;
+import java.util.function.Supplier;
+
class ManagedBufferAllocator implements BufferAllocator, AllocatorControl {
private final MemoryManager manager;
private final AllocationType allocationType;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/MemoryManager.java b/buffer/src/main/java/io/netty5/buffer/api/MemoryManager.java
index c096284232..b312095854 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/MemoryManager.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/MemoryManager.java
@@ -20,7 +20,6 @@ import io.netty5.buffer.api.internal.MemoryManagerOverride;
import io.netty5.util.internal.UnstableApi;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.ref.Cleaner;
import java.util.Optional;
import java.util.ServiceConfigurationError;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/Send.java b/buffer/src/main/java/io/netty5/buffer/api/Send.java
index df4759bff4..713098fafe 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/Send.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/Send.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api;
import io.netty5.buffer.api.internal.SendFromSupplier;
-
import java.util.function.Function;
import java.util.function.Supplier;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/adaptor/BufferIntegratable.java b/buffer/src/main/java/io/netty5/buffer/api/adaptor/BufferIntegratable.java
index 5b5b8f4ae8..e9490e2f18 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/adaptor/BufferIntegratable.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/adaptor/BufferIntegratable.java
@@ -15,9 +15,9 @@
*/
package io.netty5.buffer.api.adaptor;
+import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.ByteBufConvertible;
import io.netty5.util.ReferenceCounted;
-import io.netty5.buffer.ByteBuf;
/**
* Interfaces that are required for an object to stand-in for a {@link ByteBuf} in Netty.
diff --git a/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAdaptor.java b/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAdaptor.java
index b371a19347..43e52722b7 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAdaptor.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAdaptor.java
@@ -29,7 +29,6 @@ import io.netty5.buffer.api.internal.ResourceSupport;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.ByteProcessor;
import io.netty5.util.IllegalReferenceCountException;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAllocatorAdaptor.java b/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAllocatorAdaptor.java
index 0702b6ac53..b604538e24 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAllocatorAdaptor.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/adaptor/ByteBufAllocatorAdaptor.java
@@ -15,6 +15,8 @@
*/
package io.netty5.buffer.api.adaptor;
+import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
+
import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.ByteBufAllocator;
import io.netty5.buffer.CompositeByteBuf;
@@ -22,9 +24,6 @@ import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import io.netty5.buffer.api.internal.AdaptableBuffer;
import io.netty5.util.internal.PlatformDependent;
-
-import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
-
import java.util.Objects;
public class ByteBufAllocatorAdaptor implements ByteBufAllocator, AutoCloseable {
diff --git a/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/ByteBufferMemoryManager.java b/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/ByteBufferMemoryManager.java
index 34b04d356d..c3e10d3891 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/ByteBufferMemoryManager.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/ByteBufferMemoryManager.java
@@ -22,7 +22,6 @@ import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.StandardAllocationTypes;
import io.netty5.buffer.api.internal.Statics;
-
import java.lang.ref.Cleaner;
import java.nio.ByteBuffer;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/NioBuffer.java b/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/NioBuffer.java
index 41a5ee8909..f4da326ebe 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/NioBuffer.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/bytebuffer/NioBuffer.java
@@ -30,7 +30,6 @@ import io.netty5.buffer.api.internal.AdaptableBuffer;
import io.netty5.buffer.api.internal.ArcDrop;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.internal.PlatformDependent;
-
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ReadOnlyBufferException;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/ArcDrop.java b/buffer/src/main/java/io/netty5/buffer/api/internal/ArcDrop.java
index 36bd05adc0..d86dc77ee3 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/ArcDrop.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/ArcDrop.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api.internal;
import io.netty5.buffer.api.Drop;
-
import java.lang.invoke.MethodHandles;
import java.lang.invoke.VarHandle;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/CleanerDrop.java b/buffer/src/main/java/io/netty5/buffer/api/internal/CleanerDrop.java
index d66fdc8940..3e437dae73 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/CleanerDrop.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/CleanerDrop.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api.internal;
import io.netty5.buffer.api.Drop;
-
import java.lang.ref.Cleaner;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/LifecycleTracer.java b/buffer/src/main/java/io/netty5/buffer/api/internal/LifecycleTracer.java
index 6a6bcd4304..18da39adb2 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/LifecycleTracer.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/LifecycleTracer.java
@@ -18,7 +18,6 @@ package io.netty5.buffer.api.internal;
import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.Owned;
import io.netty5.buffer.api.Resource;
-
import java.util.ArrayDeque;
import java.util.Set;
import java.util.function.Function;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerLoader.java b/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerLoader.java
index 86313e01fc..c0797747b5 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerLoader.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerLoader.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api.internal;
import io.netty5.buffer.api.MemoryManager;
-
import java.util.ServiceLoader;
import java.util.ServiceLoader.Provider;
import java.util.stream.Stream;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerOverride.java b/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerOverride.java
index 09aa34089a..8d60f62465 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerOverride.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/MemoryManagerOverride.java
@@ -19,7 +19,6 @@ import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.bytebuffer.ByteBufferMemoryManager;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Map;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/ResourceSupport.java b/buffer/src/main/java/io/netty5/buffer/api/internal/ResourceSupport.java
index 2b28fa8852..294fd71dc4 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/ResourceSupport.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/ResourceSupport.java
@@ -19,7 +19,6 @@ import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.Owned;
import io.netty5.buffer.api.Resource;
import io.netty5.buffer.api.Send;
-
import java.util.Objects;
/**
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromOwned.java b/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromOwned.java
index 91f0048190..9413354a8a 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromOwned.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromOwned.java
@@ -15,16 +15,15 @@
*/
package io.netty5.buffer.api.internal;
+import static io.netty5.buffer.api.internal.Statics.findVarHandle;
+import static java.lang.invoke.MethodHandles.lookup;
+
import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.Owned;
import io.netty5.buffer.api.Resource;
import io.netty5.buffer.api.Send;
-
import java.lang.invoke.VarHandle;
-import static io.netty5.buffer.api.internal.Statics.findVarHandle;
-import static java.lang.invoke.MethodHandles.lookup;
-
public class SendFromOwned, T extends ResourceSupport> implements Send {
private static final VarHandle RECEIVED = findVarHandle(lookup(), SendFromOwned.class, "received", boolean.class);
private final Owned outgoing;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromSupplier.java b/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromSupplier.java
index 29d0a8fae7..018ba46861 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromSupplier.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/SendFromSupplier.java
@@ -15,16 +15,15 @@
*/
package io.netty5.buffer.api.internal;
+import static io.netty5.buffer.api.internal.Statics.findVarHandle;
+import static java.lang.invoke.MethodHandles.lookup;
+
import io.netty5.buffer.api.Resource;
import io.netty5.buffer.api.Send;
-
import java.lang.invoke.VarHandle;
import java.util.Objects;
import java.util.function.Supplier;
-import static io.netty5.buffer.api.internal.Statics.findVarHandle;
-import static java.lang.invoke.MethodHandles.lookup;
-
public class SendFromSupplier> implements Send {
private static final VarHandle GATE = findVarHandle(lookup(), SendFromSupplier.class, "gate", boolean.class);
private final Class concreteObjectType;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/internal/Statics.java b/buffer/src/main/java/io/netty5/buffer/api/internal/Statics.java
index 546c4415e6..3d636dea37 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/internal/Statics.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/internal/Statics.java
@@ -19,7 +19,6 @@ import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferClosedException;
import io.netty5.buffer.api.BufferReadOnlyException;
import io.netty5.buffer.api.Drop;
-
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolArena.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolArena.java
index eafa5126a5..418b4feed3 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolArena.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolArena.java
@@ -15,12 +15,14 @@
*/
package io.netty5.buffer.api.pool;
+import static io.netty5.buffer.api.pool.PoolChunk.isSubpage;
+import static java.lang.Math.max;
+
import io.netty5.buffer.api.AllocationType;
import io.netty5.buffer.api.AllocatorControl;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.MemoryManager;
import io.netty5.util.internal.StringUtil;
-
import java.lang.invoke.MethodHandles;
import java.lang.invoke.VarHandle;
import java.util.ArrayList;
@@ -28,9 +30,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.LongAdder;
-import static io.netty5.buffer.api.pool.PoolChunk.isSubpage;
-import static java.lang.Math.max;
-
class PoolArena extends SizeClasses implements PoolArenaMetric, AllocatorControl {
private static final VarHandle SUBPAGE_ARRAY = MethodHandles.arrayElementVarHandle(PoolSubpage[].class);
enum SizeClass {
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunk.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunk.java
index 40326bb28f..d36e207fc0 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunk.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunk.java
@@ -15,16 +15,15 @@
*/
package io.netty5.buffer.api.pool;
-import io.netty5.buffer.api.internal.CleanerDrop;
import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.internal.ArcDrop;
+import io.netty5.buffer.api.internal.CleanerDrop;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.internal.LongLongHashMap;
import io.netty5.util.internal.LongPriorityQueue;
-
import java.util.PriorityQueue;
/**
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunkList.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunkList.java
index 39ddab7a7b..3fa59f19e4 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunkList.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolChunkList.java
@@ -15,17 +15,16 @@
*/
package io.netty5.buffer.api.pool;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
import io.netty5.util.internal.StringUtil;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-
final class PoolChunkList implements PoolChunkListMetric {
private static final Iterator EMPTY_METRICS = Collections.emptyIterator();
private final PoolArena arena;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolThreadCache.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolThreadCache.java
index 0885f261b0..4495f66a4d 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PoolThreadCache.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PoolThreadCache.java
@@ -15,6 +15,8 @@
*/
package io.netty5.buffer.api.pool;
+import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
+
import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
import io.netty5.buffer.api.pool.PoolArena.SizeClass;
import io.netty5.util.internal.MathUtil;
@@ -23,13 +25,10 @@ import io.netty5.util.internal.ObjectPool.Handle;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
-import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
-
/**
* Acts a Thread cache for allocations. This implementation is modelled after
* jemalloc and the described
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocator.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocator.java
index f3813d4630..4de79e62dc 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocator.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocator.java
@@ -15,6 +15,9 @@
*/
package io.netty5.buffer.api.pool;
+import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
+import static java.util.Objects.requireNonNull;
+
import io.netty5.buffer.api.AllocationType;
import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
import io.netty5.buffer.api.Buffer;
@@ -32,16 +35,12 @@ import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.ThreadExecutorMap;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
-import static io.netty5.util.internal.ObjectUtil.checkPositiveOrZero;
-import static java.util.Objects.requireNonNull;
-
public class PooledBufferAllocator implements BufferAllocator, BufferAllocatorMetricProvider {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(PooledBufferAllocator.class);
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetric.java b/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetric.java
index ad229de782..f402bcdc92 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetric.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetric.java
@@ -16,7 +16,6 @@
package io.netty5.buffer.api.pool;
import io.netty5.util.internal.StringUtil;
-
import java.util.List;
/**
diff --git a/buffer/src/main/java/io/netty5/buffer/api/pool/UnpooledUnthetheredMemory.java b/buffer/src/main/java/io/netty5/buffer/api/pool/UnpooledUnthetheredMemory.java
index 13263d46cc..bb7239fb90 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/pool/UnpooledUnthetheredMemory.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/pool/UnpooledUnthetheredMemory.java
@@ -16,11 +16,11 @@
package io.netty5.buffer.api.pool;
import io.netty5.buffer.api.AllocationType;
+import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.internal.Statics;
-import io.netty5.buffer.api.AllocatorControl.UntetheredMemory;
@SuppressWarnings("unchecked")
class UnpooledUnthetheredMemory implements UntetheredMemory {
diff --git a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeBuffer.java b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeBuffer.java
index 1139ba4ac5..b4bfbfe2ed 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeBuffer.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeBuffer.java
@@ -29,7 +29,6 @@ import io.netty5.buffer.api.internal.AdaptableBuffer;
import io.netty5.buffer.api.internal.ArcDrop;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.internal.PlatformDependent;
-
import java.lang.ref.Reference;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeCleanerDrop.java b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeCleanerDrop.java
index 2264ded0b1..782de62491 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeCleanerDrop.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeCleanerDrop.java
@@ -19,7 +19,6 @@ import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.Drop;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.internal.PlatformDependent;
-
import java.lang.ref.Cleaner;
public class UnsafeCleanerDrop implements Drop {
diff --git a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeMemoryManager.java b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeMemoryManager.java
index aabd295ab3..72729be646 100644
--- a/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeMemoryManager.java
+++ b/buffer/src/main/java/io/netty5/buffer/api/unsafe/UnsafeMemoryManager.java
@@ -23,7 +23,6 @@ import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.StandardAllocationTypes;
import io.netty5.buffer.api.internal.Statics;
import io.netty5.util.internal.PlatformDependent;
-
import java.lang.ref.Cleaner;
public class UnsafeMemoryManager implements MemoryManager {
diff --git a/buffer/src/main/java/io/netty5/buffer/search/AhoCorasicSearchProcessorFactory.java b/buffer/src/main/java/io/netty5/buffer/search/AhoCorasicSearchProcessorFactory.java
index 65afa6a3ae..85a136e49e 100644
--- a/buffer/src/main/java/io/netty5/buffer/search/AhoCorasicSearchProcessorFactory.java
+++ b/buffer/src/main/java/io/netty5/buffer/search/AhoCorasicSearchProcessorFactory.java
@@ -16,7 +16,6 @@ package io.netty5.buffer.search;
import io.netty5.util.ByteProcessor;
import io.netty5.util.internal.PlatformDependent;
-
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/buffer/src/main/resources/META-INF/native-image/io.netty/buffer/native-image.properties b/buffer/src/main/resources/META-INF/native-image/io.netty5/buffer/native-image.properties
similarity index 77%
rename from buffer/src/main/resources/META-INF/native-image/io.netty/buffer/native-image.properties
rename to buffer/src/main/resources/META-INF/native-image/io.netty5/buffer/native-image.properties
index 4a422fde1a..d6340f8851 100644
--- a/buffer/src/main/resources/META-INF/native-image/io.netty/buffer/native-image.properties
+++ b/buffer/src/main/resources/META-INF/native-image/io.netty5/buffer/native-image.properties
@@ -12,4 +12,4 @@
# License for the specific language governing permissions and limitations
# under the License.
-Args = --initialize-at-run-time=io.netty.buffer.PooledByteBufAllocator,io.netty.buffer.ByteBufAllocator,io.netty.buffer.ByteBufUtil,io.netty.buffer.AbstractReferenceCountedByteBuf
+Args = --initialize-at-run-time=io.netty5.buffer.PooledByteBufAllocator,io.netty5.buffer.ByteBufAllocator,io.netty5.buffer.ByteBufUtil,io.netty5.buffer.AbstractReferenceCountedByteBuf
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractByteBufAllocatorTest.java b/buffer/src/test/java/io/netty5/buffer/AbstractByteBufAllocatorTest.java
similarity index 92%
rename from buffer/src/test/java/io/netty/buffer/AbstractByteBufAllocatorTest.java
rename to buffer/src/test/java/io/netty5/buffer/AbstractByteBufAllocatorTest.java
index 71e9e8da48..c2356ba52c 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AbstractByteBufAllocatorTest.java
@@ -13,24 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.AbstractByteBufAllocator;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocatorMetric;
-import io.netty5.buffer.ByteBufAllocatorMetricProvider;
-import io.netty5.buffer.SimpleLeakAwareByteBuf;
-import io.netty5.buffer.UnpooledDirectByteBuf;
-import io.netty5.buffer.UnpooledHeapByteBuf;
-import io.netty5.buffer.UnpooledUnsafeDirectByteBuf;
-import io.netty5.buffer.UnpooledUnsafeHeapByteBuf;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import io.netty5.util.internal.PlatformDependent;
+import org.junit.jupiter.api.Test;
+
public abstract class AbstractByteBufAllocatorTest extends ByteBufAllocatorTest {
@Override
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AbstractByteBufTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AbstractByteBufTest.java
index 6c904c672e..877d078cd3 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AbstractByteBufTest.java
@@ -13,19 +13,32 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static io.netty5.buffer.Unpooled.LITTLE_ENDIAN;
+import static io.netty5.buffer.Unpooled.buffer;
+import static io.netty5.buffer.Unpooled.copiedBuffer;
+import static io.netty5.buffer.Unpooled.directBuffer;
+import static io.netty5.buffer.Unpooled.unreleasableBuffer;
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
+import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import io.netty5.util.ByteProcessor;
import io.netty5.util.CharsetUtil;
import io.netty5.util.IllegalReferenceCountException;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufUtil;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -53,26 +66,10 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static io.netty5.buffer.Unpooled.LITTLE_ENDIAN;
-import static io.netty5.buffer.Unpooled.buffer;
-import static io.netty5.buffer.Unpooled.copiedBuffer;
-import static io.netty5.buffer.Unpooled.directBuffer;
-import static io.netty5.buffer.Unpooled.unreleasableBuffer;
-import static io.netty5.buffer.Unpooled.wrappedBuffer;
-import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* An abstract test class for channel buffers
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AbstractCompositeByteBufTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AbstractCompositeByteBufTest.java
index e022b7f343..77f27ddfd3 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AbstractCompositeByteBufTest.java
@@ -13,31 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.ReferenceCountUtil;
-import io.netty5.buffer.AbstractDerivedByteBuf;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocator;
-import io.netty5.buffer.ByteBufUtil;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import io.netty5.buffer.Unpooled;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.WrappedCompositeByteBuf;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.concurrent.ThreadLocalRandom;
+package io.netty5.buffer;
import static io.netty5.buffer.Unpooled.EMPTY_BUFFER;
import static io.netty5.buffer.Unpooled.buffer;
@@ -58,6 +34,20 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import io.netty5.util.ReferenceCountUtil;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.concurrent.ThreadLocalRandom;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+
/**
* An abstract test class for composite channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractPooledByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AbstractPooledByteBufTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/AbstractPooledByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AbstractPooledByteBufTest.java
index 49fe7ec263..209c401dcc 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractPooledByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AbstractPooledByteBufTest.java
@@ -13,11 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBuf;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -27,6 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public abstract class AbstractPooledByteBufTest extends AbstractByteBufTest {
protected abstract ByteBuf alloc(int length, int maxCapacity);
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractReferenceCountedByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AbstractReferenceCountedByteBufTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/AbstractReferenceCountedByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AbstractReferenceCountedByteBufTest.java
index 12e5bc6ba5..c91508b5a4 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractReferenceCountedByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AbstractReferenceCountedByteBufTest.java
@@ -13,14 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.util.IllegalReferenceCountException;
-import io.netty5.buffer.AbstractReferenceCountedByteBuf;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocator;
-import org.junit.jupiter.api.Test;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -29,11 +29,7 @@ import java.nio.ByteOrder;
import java.nio.channels.FileChannel;
import java.nio.channels.GatheringByteChannel;
import java.nio.channels.ScatteringByteChannel;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class AbstractReferenceCountedByteBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareByteBufTest.java
index 3a32194a2a..5405133fd3 100644
--- a/buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareByteBufTest.java
@@ -13,19 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import static io.netty5.buffer.Unpooled.*;
+import static io.netty5.buffer.Unpooled.compositeBuffer;
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import io.netty5.buffer.AdvancedLeakAwareByteBuf;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.SimpleLeakAwareByteBuf;
-import org.junit.jupiter.api.Test;
-
import io.netty5.util.CharsetUtil;
import io.netty5.util.ResourceLeakTracker;
+import org.junit.jupiter.api.Test;
public class AdvancedLeakAwareByteBufTest extends SimpleLeakAwareByteBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareCompositeByteBufTest.java
similarity index 80%
rename from buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareCompositeByteBufTest.java
index 8752ee1a2e..52fc89039e 100644
--- a/buffer/src/test/java/io/netty/buffer/AdvancedLeakAwareCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AdvancedLeakAwareCompositeByteBufTest.java
@@ -13,14 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.ResourceLeakTracker;
-import io.netty5.buffer.AdvancedLeakAwareByteBuf;
-import io.netty5.buffer.AdvancedLeakAwareCompositeByteBuf;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.SimpleLeakAwareCompositeByteBuf;
public class AdvancedLeakAwareCompositeByteBufTest extends SimpleLeakAwareCompositeByteBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/AlignedPooledByteBufAllocatorTest.java b/buffer/src/test/java/io/netty5/buffer/AlignedPooledByteBufAllocatorTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/AlignedPooledByteBufAllocatorTest.java
rename to buffer/src/test/java/io/netty5/buffer/AlignedPooledByteBufAllocatorTest.java
index f021ba811a..e33b9bfe10 100644
--- a/buffer/src/test/java/io/netty/buffer/AlignedPooledByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/AlignedPooledByteBufAllocatorTest.java
@@ -13,9 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.PooledByteBufAllocator;
+package io.netty5.buffer;
public class AlignedPooledByteBufAllocatorTest extends PooledByteBufAllocatorTest {
@Override
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/BigEndianCompositeByteBufTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/BigEndianCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/BigEndianCompositeByteBufTest.java
index 1e3f7dd041..b14e637060 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/BigEndianCompositeByteBufTest.java
@@ -13,9 +13,8 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.Unpooled;
import org.junit.jupiter.api.Test;
/**
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/BigEndianDirectByteBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/BigEndianDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/BigEndianDirectByteBufTest.java
index fccead2802..2b48b37d78 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/BigEndianDirectByteBufTest.java
@@ -13,17 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledDirectByteBuf;
import java.nio.ByteOrder;
-
import org.junit.jupiter.api.Test;
/**
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianHeapByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/BigEndianHeapByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/BigEndianHeapByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/BigEndianHeapByteBufTest.java
index 5bf989ad60..694e3a2b19 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianHeapByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/BigEndianHeapByteBufTest.java
@@ -13,17 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.Unpooled;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledHeapByteBuf;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
/**
* Tests big-endian heap channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianUnsafeDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeDirectByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/BigEndianUnsafeDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeDirectByteBufTest.java
index c6eb6c11c6..ec836e813f 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianUnsafeDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeDirectByteBufTest.java
@@ -13,13 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledUnsafeDirectByteBuf;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java
index e85f931b31..e842c72baa 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/BigEndianUnsafeNoCleanerDirectByteBufTest.java
@@ -13,12 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledUnsafeNoCleanerDirectByteBuf;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufAllocatorTest.java b/buffer/src/test/java/io/netty5/buffer/ByteBufAllocatorTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/ByteBufAllocatorTest.java
rename to buffer/src/test/java/io/netty5/buffer/ByteBufAllocatorTest.java
index 74d5684ea5..754514681b 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ByteBufAllocatorTest.java
@@ -13,15 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocator;
-import io.netty5.buffer.CompositeByteBuf;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public abstract class ByteBufAllocatorTest {
protected abstract int defaultMaxCapacity();
diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java b/buffer/src/test/java/io/netty5/buffer/ByteBufDerivationTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java
rename to buffer/src/test/java/io/netty5/buffer/ByteBufDerivationTest.java
index 0f9a9b1402..1082de8d31 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ByteBufDerivationTest.java
@@ -14,21 +14,18 @@
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.AbstractUnpooledSlicedByteBuf;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.DuplicatedByteBuf;
-import io.netty5.buffer.ReadOnlyByteBuf;
-import io.netty5.buffer.SwappedByteBuf;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.sameInstance;
import java.nio.ByteOrder;
import java.util.Random;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import org.junit.jupiter.api.Test;
/**
* Tests wrapping a wrapped buffer does not go way too deep chaining.
diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufStreamTest.java b/buffer/src/test/java/io/netty5/buffer/ByteBufStreamTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/ByteBufStreamTest.java
rename to buffer/src/test/java/io/netty5/buffer/ByteBufStreamTest.java
index 6ac62021ce..ac320e09c3 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteBufStreamTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ByteBufStreamTest.java
@@ -13,18 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufInputStream;
-import io.netty5.buffer.ByteBufOutputStream;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Test;
-
-import java.io.EOFException;
-import java.nio.charset.Charset;
-
-import static io.netty5.util.internal.EmptyArrays.*;
+import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -34,6 +25,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import java.io.EOFException;
+import java.nio.charset.Charset;
+import org.junit.jupiter.api.Test;
+
/**
* Tests channel buffer streams
*/
diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java b/buffer/src/test/java/io/netty5/buffer/ByteBufUtilTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
rename to buffer/src/test/java/io/netty5/buffer/ByteBufUtilTest.java
index da50b4dd3b..961874cde9 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ByteBufUtilTest.java
@@ -13,31 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.AsciiString;
-import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufUtil;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import io.netty5.buffer.SwappedByteBuf;
-import io.netty5.buffer.Unpooled;
-import io.netty5.buffer.WrappedByteBuf;
-import io.netty5.buffer.WrappedCompositeByteBuf;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
+package io.netty5.buffer;
import static io.netty5.buffer.Unpooled.unreleasableBuffer;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -51,6 +27,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import io.netty5.util.AsciiString;
+import io.netty5.util.CharsetUtil;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
public class ByteBufUtilTest {
private static final String PARAMETERIZED_NAME = "bufferType = {0}";
diff --git a/buffer/src/test/java/io/netty/buffer/ByteProcessorTest.java b/buffer/src/test/java/io/netty5/buffer/ByteProcessorTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/ByteProcessorTest.java
rename to buffer/src/test/java/io/netty5/buffer/ByteProcessorTest.java
index 2d646c13d8..5f16621f80 100644
--- a/buffer/src/test/java/io/netty/buffer/ByteProcessorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ByteProcessorTest.java
@@ -14,14 +14,12 @@
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
+
import io.netty5.util.ByteProcessor;
import io.netty5.util.CharsetUtil;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.Unpooled;
import org.junit.jupiter.api.Test;
public class ByteProcessorTest {
diff --git a/buffer/src/test/java/io/netty/buffer/ConsolidationTest.java b/buffer/src/test/java/io/netty5/buffer/ConsolidationTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/ConsolidationTest.java
rename to buffer/src/test/java/io/netty5/buffer/ConsolidationTest.java
index 4b59523ce8..b8816c22e9 100644
--- a/buffer/src/test/java/io/netty/buffer/ConsolidationTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ConsolidationTest.java
@@ -13,15 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.ByteBuf;
import org.junit.jupiter.api.Test;
-import static io.netty5.buffer.Unpooled.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* Tests buffer consolidation
*/
diff --git a/buffer/src/test/java/io/netty/buffer/DefaultByteBufHolderTest.java b/buffer/src/test/java/io/netty5/buffer/DefaultByteBufHolderTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/DefaultByteBufHolderTest.java
rename to buffer/src/test/java/io/netty5/buffer/DefaultByteBufHolderTest.java
index a6e2236ce4..5619d185b1 100644
--- a/buffer/src/test/java/io/netty/buffer/DefaultByteBufHolderTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/DefaultByteBufHolderTest.java
@@ -13,19 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufHolder;
-import io.netty5.buffer.DefaultByteBufHolder;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class DefaultByteBufHolderTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/DuplicatedByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/DuplicatedByteBufTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/DuplicatedByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/DuplicatedByteBufTest.java
index c4a1422feb..1829863589 100644
--- a/buffer/src/test/java/io/netty/buffer/DuplicatedByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/DuplicatedByteBufTest.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.DuplicatedByteBuf;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
/**
* Tests duplicated channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/EmptyByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/EmptyByteBufTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/EmptyByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/EmptyByteBufTest.java
index ef9477a95e..3bde991e94 100644
--- a/buffer/src/test/java/io/netty/buffer/EmptyByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/EmptyByteBufTest.java
@@ -13,23 +13,20 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.EmptyByteBuf;
-import io.netty5.buffer.Unpooled;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledHeapByteBuf;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.sameInstance;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import io.netty5.util.CharsetUtil;
+import org.junit.jupiter.api.Test;
+
public class EmptyByteBufTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/FixedCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/FixedCompositeByteBufTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/FixedCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/FixedCompositeByteBufTest.java
index 9908c25fe5..60c996dd89 100644
--- a/buffer/src/test/java/io/netty/buffer/FixedCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/FixedCompositeByteBufTest.java
@@ -13,17 +13,20 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufOutputStream;
-import io.netty5.buffer.ByteBufUtil;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.FixedCompositeByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
+import static io.netty5.buffer.Unpooled.EMPTY_BUFFER;
+import static io.netty5.buffer.Unpooled.buffer;
+import static io.netty5.buffer.Unpooled.compositeBuffer;
+import static io.netty5.buffer.Unpooled.directBuffer;
+import static io.netty5.buffer.Unpooled.unmodifiableBuffer;
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,14 +35,8 @@ import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.nio.channels.ScatteringByteChannel;
import java.nio.charset.Charset;
-
-import static io.netty5.buffer.Unpooled.*;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
public class FixedCompositeByteBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/LittleEndianCompositeByteBufTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/LittleEndianCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/LittleEndianCompositeByteBufTest.java
index 1e96b9a4f9..4990e528c9 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/LittleEndianCompositeByteBufTest.java
@@ -13,11 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.Unpooled;
-
/**
* Tests little-endian composite channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/LittleEndianDirectByteBufTest.java
similarity index 90%
rename from buffer/src/test/java/io/netty/buffer/LittleEndianDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/LittleEndianDirectByteBufTest.java
index d988ff3e29..ee30ae54c4 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/LittleEndianDirectByteBufTest.java
@@ -13,14 +13,11 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledDirectByteBuf;
import java.nio.ByteOrder;
/**
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianHeapByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/LittleEndianHeapByteBufTest.java
similarity index 92%
rename from buffer/src/test/java/io/netty/buffer/LittleEndianHeapByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/LittleEndianHeapByteBufTest.java
index 660f4074bf..dc32914e5d 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianHeapByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/LittleEndianHeapByteBufTest.java
@@ -13,12 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.Unpooled;
import java.nio.ByteOrder;
/**
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeDirectByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeDirectByteBufTest.java
index 2445acd560..ac12263bcb 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeDirectByteBufTest.java
@@ -13,12 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledUnsafeDirectByteBuf;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java
index abc1defa5d..d71764e48e 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/LittleEndianUnsafeNoCleanerDirectByteBufTest.java
@@ -13,12 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledUnsafeNoCleanerDirectByteBuf;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/buffer/src/test/java/io/netty/buffer/NoopResourceLeakTracker.java b/buffer/src/test/java/io/netty5/buffer/NoopResourceLeakTracker.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/NoopResourceLeakTracker.java
rename to buffer/src/test/java/io/netty5/buffer/NoopResourceLeakTracker.java
index 2d85beb3a8..99cca1531a 100644
--- a/buffer/src/test/java/io/netty/buffer/NoopResourceLeakTracker.java
+++ b/buffer/src/test/java/io/netty5/buffer/NoopResourceLeakTracker.java
@@ -13,10 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import io.netty5.util.ResourceLeakTracker;
-
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/buffer/src/test/java/io/netty/buffer/PoolArenaTest.java b/buffer/src/test/java/io/netty5/buffer/PoolArenaTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/PoolArenaTest.java
rename to buffer/src/test/java/io/netty5/buffer/PoolArenaTest.java
index 3ec1ed5122..a0556092fb 100644
--- a/buffer/src/test/java/io/netty/buffer/PoolArenaTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PoolArenaTest.java
@@ -14,21 +14,15 @@
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PoolArena;
-import io.netty5.buffer.PoolArenaMetric;
-import io.netty5.buffer.PooledByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.ByteBuffer;
+import org.junit.jupiter.api.Test;
+
public class PoolArenaTest {
private static final int PAGE_SIZE = 8192;
diff --git a/buffer/src/test/java/io/netty/buffer/PooledAlignedBigEndianDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/PooledAlignedBigEndianDirectByteBufTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/PooledAlignedBigEndianDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledAlignedBigEndianDirectByteBufTest.java
index b612c8c51f..4947136d8e 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledAlignedBigEndianDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledAlignedBigEndianDirectByteBufTest.java
@@ -13,17 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
-import java.nio.ByteOrder;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertSame;
+import java.nio.ByteOrder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
public class PooledAlignedBigEndianDirectByteBufTest extends PooledBigEndianDirectByteBufTest {
private static final int directMemoryCacheAlignment = 1;
private static PooledByteBufAllocator allocator;
diff --git a/buffer/src/test/java/io/netty/buffer/PooledBigEndianDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/PooledBigEndianDirectByteBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/PooledBigEndianDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledBigEndianDirectByteBufTest.java
index a884b33092..044ecef1b7 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledBigEndianDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledBigEndianDirectByteBufTest.java
@@ -13,14 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import java.nio.ByteOrder;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertSame;
+import java.nio.ByteOrder;
+
/**
* Tests big-endian direct channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/PooledBigEndianHeapByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/PooledBigEndianHeapByteBufTest.java
similarity index 89%
rename from buffer/src/test/java/io/netty/buffer/PooledBigEndianHeapByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledBigEndianHeapByteBufTest.java
index 788a9f884e..5fc0311be5 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledBigEndianHeapByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledBigEndianHeapByteBufTest.java
@@ -13,10 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
+package io.netty5.buffer;
/**
* Tests big-endian heap channel buffers
diff --git a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java b/buffer/src/test/java/io/netty5/buffer/PooledByteBufAllocatorTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledByteBufAllocatorTest.java
index fde5d798b1..964b587062 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledByteBufAllocatorTest.java
@@ -14,27 +14,20 @@
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static io.netty5.buffer.PoolChunk.runOffset;
+import static io.netty5.buffer.PoolChunk.runPages;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.netty5.util.concurrent.FastThreadLocal;
import io.netty5.util.concurrent.FastThreadLocalThread;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.SystemPropertyUtil;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocator;
-import io.netty5.buffer.PoolArenaMetric;
-import io.netty5.buffer.PoolChunk;
-import io.netty5.buffer.PoolChunkListMetric;
-import io.netty5.buffer.PoolSubpageMetric;
-import io.netty5.buffer.PooledByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import io.netty5.buffer.PooledDirectByteBuf;
-import io.netty5.buffer.PooledHeapByteBuf;
-import io.netty5.buffer.PooledUnsafeDirectByteBuf;
-import io.netty5.buffer.PooledUnsafeHeapByteBuf;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -44,16 +37,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import static io.netty5.buffer.PoolChunk.runOffset;
-import static io.netty5.buffer.PoolChunk.runPages;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class PooledByteBufAllocatorTest extends AbstractByteBufAllocatorTest {
@Override
diff --git a/buffer/src/test/java/io/netty/buffer/PooledLittleEndianDirectByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/PooledLittleEndianDirectByteBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/PooledLittleEndianDirectByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledLittleEndianDirectByteBufTest.java
index 390a587383..758fce026d 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledLittleEndianDirectByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledLittleEndianDirectByteBufTest.java
@@ -13,14 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import java.nio.ByteOrder;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertSame;
+import java.nio.ByteOrder;
+
/**
* Tests little-endian direct channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/PooledLittleEndianHeapByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/PooledLittleEndianHeapByteBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/PooledLittleEndianHeapByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/PooledLittleEndianHeapByteBufTest.java
index 1af6ac85b2..c7660ed582 100644
--- a/buffer/src/test/java/io/netty/buffer/PooledLittleEndianHeapByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/PooledLittleEndianHeapByteBufTest.java
@@ -13,14 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.PooledByteBufAllocator;
-import java.nio.ByteOrder;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertSame;
+import java.nio.ByteOrder;
+
/**
* Tests little-endian heap channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufTest.java
index f8b647cbe0..3ee676cd98 100644
--- a/buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufTest.java
@@ -13,18 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ReadOnlyByteBuf;
-import org.junit.jupiter.api.Test;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ReadOnlyBufferException;
-import java.nio.channels.GatheringByteChannel;
-import java.nio.channels.ScatteringByteChannel;
+package io.netty5.buffer;
import static io.netty5.buffer.ByteBufUtil.ensureWritableSuccess;
import static io.netty5.buffer.Unpooled.BIG_ENDIAN;
@@ -40,6 +29,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import org.junit.jupiter.api.Test;
+
/**
* Tests read-only channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufferBufTest.java b/buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufferBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufferBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufferBufTest.java
index f4fe530695..de93ce32dc 100644
--- a/buffer/src/test/java/io/netty/buffer/ReadOnlyByteBufferBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ReadOnlyByteBufferBufTest.java
@@ -13,17 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ReadOnlyByteBufferBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.ByteBuffer;
import java.util.concurrent.ThreadLocalRandom;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class ReadOnlyByteBufferBufTest extends ReadOnlyDirectByteBufferBufTest {
@Override
diff --git a/buffer/src/test/java/io/netty/buffer/ReadOnlyDirectByteBufferBufTest.java b/buffer/src/test/java/io/netty5/buffer/ReadOnlyDirectByteBufferBufTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/ReadOnlyDirectByteBufferBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/ReadOnlyDirectByteBufferBufTest.java
index c15759fe77..bfc46dd81d 100644
--- a/buffer/src/test/java/io/netty/buffer/ReadOnlyDirectByteBufferBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ReadOnlyDirectByteBufferBufTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ReadOnlyByteBufferBuf;
-import io.netty5.buffer.Unpooled;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import org.junit.jupiter.api.Test;
-
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
@@ -30,12 +30,7 @@ import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.nio.channels.FileChannel;
import java.util.concurrent.ThreadLocalRandom;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class ReadOnlyDirectByteBufferBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java b/buffer/src/test/java/io/netty5/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java
similarity index 91%
rename from buffer/src/test/java/io/netty/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java
index c293bf00ec..26fc76a60a 100644
--- a/buffer/src/test/java/io/netty/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/ReadOnlyUnsafeDirectByteBufferBufTest.java
@@ -13,20 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ReadOnlyUnsafeDirectByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import io.netty5.util.internal.PlatformDependent;
+import java.nio.ByteBuffer;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
public class ReadOnlyUnsafeDirectByteBufferBufTest extends ReadOnlyDirectByteBufferBufTest {
/**
diff --git a/buffer/src/test/java/io/netty/buffer/RetainedDuplicatedByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/RetainedDuplicatedByteBufTest.java
similarity index 92%
rename from buffer/src/test/java/io/netty/buffer/RetainedDuplicatedByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/RetainedDuplicatedByteBufTest.java
index 9797c46ea9..c72b3a19f6 100644
--- a/buffer/src/test/java/io/netty/buffer/RetainedDuplicatedByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/RetainedDuplicatedByteBufTest.java
@@ -14,13 +14,10 @@
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.Unpooled;
-
public class RetainedDuplicatedByteBufTest extends DuplicatedByteBufTest {
@Override
protected ByteBuf newBuffer(int length, int maxCapacity) {
diff --git a/buffer/src/test/java/io/netty/buffer/RetainedSlicedByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/RetainedSlicedByteBufTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/RetainedSlicedByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/RetainedSlicedByteBufTest.java
index 376d92b0cb..2966619140 100644
--- a/buffer/src/test/java/io/netty/buffer/RetainedSlicedByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/RetainedSlicedByteBufTest.java
@@ -14,12 +14,10 @@
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import io.netty5.buffer.ByteBuf;
-
public class RetainedSlicedByteBufTest extends SlicedByteBufTest {
@Override
diff --git a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareByteBufTest.java
similarity index 97%
rename from buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareByteBufTest.java
index f0552655e1..a82dadbf4f 100644
--- a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareByteBufTest.java
@@ -13,21 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.ResourceLeakTracker;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.SimpleLeakAwareByteBuf;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayDeque;
-import java.util.Queue;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.netty5.util.ResourceLeakTracker;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class SimpleLeakAwareByteBufTest extends BigEndianHeapByteBufTest {
private final Class clazz = leakClass();
private final Queue> trackers = new ArrayDeque<>();
diff --git a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareCompositeByteBufTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareCompositeByteBufTest.java
index 072f05107e..cd34a6838d 100644
--- a/buffer/src/test/java/io/netty/buffer/SimpleLeakAwareCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/SimpleLeakAwareCompositeByteBufTest.java
@@ -13,27 +13,21 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.ResourceLeakTracker;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.SimpleLeakAwareByteBuf;
-import io.netty5.buffer.SimpleLeakAwareCompositeByteBuf;
-import io.netty5.buffer.WrappedCompositeByteBuf;
-import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayDeque;
-import java.util.Queue;
+package io.netty5.buffer;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.netty5.util.ResourceLeakTracker;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class SimpleLeakAwareCompositeByteBufTest extends WrappedCompositeByteBufTest {
private final Class clazz = leakClass();
diff --git a/buffer/src/test/java/io/netty/buffer/SlicedByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/SlicedByteBufTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/SlicedByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/SlicedByteBufTest.java
index e278f01fb1..e2af24c4cb 100644
--- a/buffer/src/test/java/io/netty/buffer/SlicedByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/SlicedByteBufTest.java
@@ -13,23 +13,19 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.SlicedByteBuf;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.ThreadLocalRandom;
+package io.netty5.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.ByteBuffer;
+import java.util.concurrent.ThreadLocalRandom;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
/**
* Tests sliced channel buffers
*/
diff --git a/buffer/src/test/java/io/netty/buffer/UnpooledByteBufAllocatorTest.java b/buffer/src/test/java/io/netty5/buffer/UnpooledByteBufAllocatorTest.java
similarity index 93%
rename from buffer/src/test/java/io/netty/buffer/UnpooledByteBufAllocatorTest.java
rename to buffer/src/test/java/io/netty5/buffer/UnpooledByteBufAllocatorTest.java
index 26a100bd31..b24fcb9b5d 100644
--- a/buffer/src/test/java/io/netty/buffer/UnpooledByteBufAllocatorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/UnpooledByteBufAllocatorTest.java
@@ -13,9 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.UnpooledByteBufAllocator;
+package io.netty5.buffer;
public class UnpooledByteBufAllocatorTest extends AbstractByteBufAllocatorTest {
diff --git a/buffer/src/test/java/io/netty/buffer/UnpooledTest.java b/buffer/src/test/java/io/netty5/buffer/UnpooledTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/UnpooledTest.java
rename to buffer/src/test/java/io/netty5/buffer/UnpooledTest.java
index a6273521eb..1dd4345ac6 100644
--- a/buffer/src/test/java/io/netty/buffer/UnpooledTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/UnpooledTest.java
@@ -13,14 +13,31 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static io.netty5.buffer.Unpooled.EMPTY_BUFFER;
+import static io.netty5.buffer.Unpooled.LITTLE_ENDIAN;
+import static io.netty5.buffer.Unpooled.buffer;
+import static io.netty5.buffer.Unpooled.copiedBuffer;
+import static io.netty5.buffer.Unpooled.copyBoolean;
+import static io.netty5.buffer.Unpooled.copyDouble;
+import static io.netty5.buffer.Unpooled.copyFloat;
+import static io.netty5.buffer.Unpooled.copyInt;
+import static io.netty5.buffer.Unpooled.copyLong;
+import static io.netty5.buffer.Unpooled.copyMedium;
+import static io.netty5.buffer.Unpooled.copyShort;
+import static io.netty5.buffer.Unpooled.unmodifiableBuffer;
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
+import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
+import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTE_BUFFERS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufUtil;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.channels.ScatteringByteChannel;
@@ -30,15 +47,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-
-import static io.netty5.buffer.Unpooled.*;
-import static io.netty5.util.internal.EmptyArrays.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
/**
* Tests channel buffers
diff --git a/buffer/src/test/java/io/netty/buffer/UnreleaseableByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/UnreleaseableByteBufTest.java
similarity index 94%
rename from buffer/src/test/java/io/netty/buffer/UnreleaseableByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/UnreleaseableByteBufTest.java
index 164e17e1e8..9b17ae7e64 100644
--- a/buffer/src/test/java/io/netty/buffer/UnreleaseableByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/UnreleaseableByteBufTest.java
@@ -13,11 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.Unpooled;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer;
import static io.netty5.buffer.Unpooled.buffer;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,6 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class UnreleaseableByteBufTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/UnsafeByteBufUtilTest.java b/buffer/src/test/java/io/netty5/buffer/UnsafeByteBufUtilTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/UnsafeByteBufUtilTest.java
rename to buffer/src/test/java/io/netty5/buffer/UnsafeByteBufUtilTest.java
index b46119fa1d..a0722cd7d1 100644
--- a/buffer/src/test/java/io/netty/buffer/UnsafeByteBufUtilTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/UnsafeByteBufUtilTest.java
@@ -13,20 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.ByteBufAllocator;
-import io.netty5.buffer.PooledByteBufAllocator;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.UnpooledDirectByteBuf;
-import io.netty5.buffer.UnsafeByteBufUtil;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
+package io.netty5.buffer;
import static io.netty5.util.internal.PlatformDependent.directBufferAddress;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -34,6 +21,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import io.netty5.util.internal.PlatformDependent;
+import java.nio.ByteBuffer;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class UnsafeByteBufUtilTest {
@BeforeEach
public void checkHasUnsafe() {
diff --git a/buffer/src/test/java/io/netty/buffer/WrappedCompositeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/WrappedCompositeByteBufTest.java
similarity index 88%
rename from buffer/src/test/java/io/netty/buffer/WrappedCompositeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/WrappedCompositeByteBufTest.java
index 4cf985b5bd..9704216760 100644
--- a/buffer/src/test/java/io/netty/buffer/WrappedCompositeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/WrappedCompositeByteBufTest.java
@@ -13,11 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
-
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.CompositeByteBuf;
-import io.netty5.buffer.WrappedCompositeByteBuf;
+package io.netty5.buffer;
public class WrappedCompositeByteBufTest extends BigEndianCompositeByteBufTest {
diff --git a/buffer/src/test/java/io/netty/buffer/WrappedUnpooledUnsafeByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/WrappedUnpooledUnsafeByteBufTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/WrappedUnpooledUnsafeByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/WrappedUnpooledUnsafeByteBufTest.java
index df416b3174..0ee23f7220 100644
--- a/buffer/src/test/java/io/netty/buffer/WrappedUnpooledUnsafeByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/WrappedUnpooledUnsafeByteBufTest.java
@@ -13,18 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer;
+package io.netty5.buffer;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.util.internal.PlatformDependent;
-import io.netty5.buffer.ByteBuf;
-import io.netty5.buffer.UnpooledByteBufAllocator;
-import io.netty5.buffer.WrappedUnpooledUnsafeDirectByteBuf;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class WrappedUnpooledUnsafeByteBufTest extends BigEndianUnsafeDirectByteBufTest {
@BeforeEach
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferBulkAccessTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferBulkAccessTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferBulkAccessTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferBulkAccessTest.java
index ddd41210d4..102a85865c 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferBulkAccessTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferBulkAccessTest.java
@@ -13,18 +13,17 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
-
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.nio.ByteBuffer;
+package io.netty5.buffer.api.tests;
import static io.netty5.buffer.api.CompositeBuffer.compose;
import static org.assertj.core.api.Assertions.assertThat;
+import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.api.BufferAllocator;
+import java.nio.ByteBuffer;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
public class BufferBulkAccessTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferByteOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferByteOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferByteOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferByteOffsettedAccessorsTest.java
index 789b27fa74..55e07e13d5 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferByteOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferByteOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferByteOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCharOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCharOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferCharOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferCharOffsettedAccessorsTest.java
index decaa5f00f..c3227b0cf7 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCharOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCharOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferCharOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCleanerTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCleanerTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferCleanerTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferCleanerTest.java
index 6c4096894f..5b68c2980d 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCleanerTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCleanerTest.java
@@ -13,22 +13,21 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
-
-import io.netty5.buffer.api.MemoryManager;
-import io.netty5.buffer.api.internal.Statics;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+package io.netty5.buffer.api.tests;
import static io.netty5.buffer.api.MemoryManager.using;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import io.netty5.buffer.api.MemoryManager;
+import io.netty5.buffer.api.internal.Statics;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
public class BufferCleanerTest extends BufferTestSupport {
static Fixture[] unsafeAllocators() {
Optional maybeManager = MemoryManager.lookupImplementation("Unsafe");
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCompactTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompactTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferCompactTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompactTest.java
index e5c665e081..7798f5e2f1 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCompactTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompactTest.java
@@ -13,7 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static io.netty5.buffer.api.internal.Statics.acquire;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -21,9 +24,6 @@ import io.netty5.buffer.api.internal.ResourceSupport;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static io.netty5.buffer.api.internal.Statics.acquire;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferCompactTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferComponentIterationTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferComponentIterationTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferComponentIterationTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferComponentIterationTest.java
index 969ac7daca..9247c05479 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferComponentIterationTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferComponentIterationTest.java
@@ -13,7 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -21,18 +24,14 @@ import io.netty5.buffer.api.BufferClosedException;
import io.netty5.buffer.api.BufferReadOnlyException;
import io.netty5.buffer.api.ByteCursor;
import io.netty5.buffer.api.CompositeBuffer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
public class BufferComponentIterationTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCompositionTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompositionTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferCompositionTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompositionTest.java
index 133705d8f4..f86fc80e31 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferCompositionTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferCompositionTest.java
@@ -13,7 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static io.netty5.buffer.api.internal.Statics.acquire;
+import static io.netty5.buffer.api.internal.Statics.isOwned;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -26,12 +32,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static io.netty5.buffer.api.internal.Statics.acquire;
-import static io.netty5.buffer.api.internal.Statics.isOwned;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class BufferCompositionTest extends BufferTestSupport {
@Test
public void compositeBuffersCannotHaveDuplicateComponents() {
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java
index aace159a61..660543b7f8 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferDoubleOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferDoubleOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferEnsureWritableTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferEnsureWritableTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferEnsureWritableTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferEnsureWritableTest.java
index d164fdd946..d175a0bc63 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferEnsureWritableTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferEnsureWritableTest.java
@@ -13,7 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -22,9 +25,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferEnsureWritableTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java
index 35047656cc..63fb87d081 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferFloatOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferFloatOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferIntOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferIntOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferIntOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferIntOffsettedAccessorsTest.java
index ab7bc6303a..c5ff27d78e 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferIntOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferIntOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferIntOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferLifeCycleTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferLifeCycleTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferLifeCycleTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferLifeCycleTest.java
index 85ae561908..358834f0ef 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferLifeCycleTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferLifeCycleTest.java
@@ -13,21 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
-
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.BufferClosedException;
-import io.netty5.buffer.api.CompositeBuffer;
-import io.netty5.buffer.api.internal.ResourceSupport;
-import io.netty5.util.internal.EmptyArrays;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.Supplier;
+package io.netty5.buffer.api.tests;
import static io.netty5.buffer.api.internal.Statics.acquire;
import static io.netty5.buffer.api.internal.Statics.isOwned;
@@ -36,6 +22,19 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.api.BufferClosedException;
+import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.util.internal.EmptyArrays;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.Supplier;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
public class BufferLifeCycleTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferLongOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferLongOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferLongOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferLongOffsettedAccessorsTest.java
index 9f0562b1a7..782636f3e5 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferLongOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferLongOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferLongOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java
index 76292e3e44..01adec70e6 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferMediumOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferMediumOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferOffsetsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferOffsetsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferOffsetsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferOffsetsTest.java
index abcef24c15..7400b89f64 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferOffsetsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferOffsetsTest.java
@@ -13,16 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferOffsetsTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java
index a561d131cc..070e0f6f35 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferPrimitiveRelativeAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferPrimitiveRelativeAccessorsTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferReadOnlyTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferReadOnlyTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferReadOnlyTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferReadOnlyTest.java
index 3bfbb84df3..8112d56bc6 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferReadOnlyTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferReadOnlyTest.java
@@ -13,7 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static io.netty5.buffer.api.internal.Statics.isOwned;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -21,18 +27,11 @@ import io.netty5.buffer.api.BufferReadOnlyException;
import io.netty5.buffer.api.CompositeBuffer;
import io.netty5.buffer.api.Send;
import io.netty5.buffer.api.internal.ResourceSupport;
+import java.util.function.Supplier;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import java.util.function.Supplier;
-
-import static io.netty5.buffer.api.internal.Statics.isOwned;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class BufferReadOnlyTest extends BufferTestSupport {
@ParameterizedTest
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferRefTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferRefTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferRefTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferRefTest.java
index 78af9c399b..730da4d0d8 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferRefTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferRefTest.java
@@ -13,19 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import io.netty5.buffer.api.BufferClosedException;
import io.netty5.buffer.api.BufferRef;
import io.netty5.buffer.api.Send;
-import org.junit.jupiter.api.Test;
-
import java.util.concurrent.atomic.AtomicReference;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
class BufferRefTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferSendTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferSendTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferSendTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferSendTest.java
index 1b703812df..4d588657bd 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferSendTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferSendTest.java
@@ -13,21 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
-
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.BufferClosedException;
-import io.netty5.buffer.api.BufferRef;
-import io.netty5.buffer.api.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.Future;
-import java.util.concurrent.SynchronousQueue;
+package io.netty5.buffer.api.tests;
import static io.netty5.buffer.api.internal.Statics.acquire;
import static io.netty5.buffer.api.internal.Statics.isOwned;
@@ -36,6 +22,19 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.api.BufferClosedException;
+import io.netty5.buffer.api.BufferRef;
+import io.netty5.buffer.api.Send;
+import io.netty5.buffer.api.internal.ResourceSupport;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Future;
+import java.util.concurrent.SynchronousQueue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
public class BufferSendTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferShortOffsettedAccessorsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferShortOffsettedAccessorsTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferShortOffsettedAccessorsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferShortOffsettedAccessorsTest.java
index 2d6e28c9a0..b7a618af5b 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferShortOffsettedAccessorsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferShortOffsettedAccessorsTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
public class BufferShortOffsettedAccessorsTest extends BufferTestSupport {
@ParameterizedTest
@MethodSource("allocators")
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferTestSupport.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferTestSupport.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferTestSupport.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferTestSupport.java
index 3b76786795..0e48a17d6e 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferTestSupport.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferTestSupport.java
@@ -13,7 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static io.netty5.buffer.api.internal.Statics.acquire;
+import static io.netty5.buffer.api.tests.Fixture.Properties.DIRECT;
+import static io.netty5.buffer.api.tests.Fixture.Properties.HEAP;
+import static io.netty5.buffer.api.tests.Fixture.Properties.POOLED;
+import static java.nio.ByteOrder.BIG_ENDIAN;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
@@ -23,9 +34,6 @@ import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.internal.ResourceSupport;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
@@ -47,17 +55,8 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.Stream.Builder;
-
-import static io.netty5.buffer.api.internal.Statics.acquire;
-import static io.netty.buffer.api.tests.Fixture.Properties.DIRECT;
-import static io.netty.buffer.api.tests.Fixture.Properties.HEAP;
-import static io.netty.buffer.api.tests.Fixture.Properties.POOLED;
-import static java.nio.ByteOrder.BIG_ENDIAN;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public abstract class BufferTestSupport {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(BufferTestSupport.class);
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/BufferWriteBytesCombinationsTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferWriteBytesCombinationsTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/api/tests/BufferWriteBytesCombinationsTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/BufferWriteBytesCombinationsTest.java
index d97b5dcc02..2328966411 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/BufferWriteBytesCombinationsTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/BufferWriteBytesCombinationsTest.java
@@ -13,17 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator;
+import java.util.Arrays;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
public class BufferWriteBytesCombinationsTest extends BufferTestSupport {
private static final Memoize OTHER_FIXTURES = new Memoize(
() -> Arrays.stream(allocators()).filter(filterOfTheDay(10)).toArray(Fixture[]::new));
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/Fixture.java b/buffer/src/test/java/io/netty5/buffer/api/tests/Fixture.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/api/tests/Fixture.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/Fixture.java
index 632a4e15c1..880269dfa8 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/Fixture.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/Fixture.java
@@ -13,10 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
import io.netty5.buffer.api.BufferAllocator;
-
import java.util.Arrays;
import java.util.EnumSet;
import java.util.function.Supplier;
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/Memoize.java b/buffer/src/test/java/io/netty5/buffer/api/tests/Memoize.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/api/tests/Memoize.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/Memoize.java
index fbfda6b6ec..05211fa7de 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/Memoize.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/Memoize.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests;
+package io.netty5.buffer.api.tests;
import java.util.function.Supplier;
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/AbstractByteBufTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/AbstractByteBufTest.java
similarity index 99%
rename from buffer/src/test/java/io/netty/buffer/api/tests/adaptor/AbstractByteBufTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/AbstractByteBufTest.java
index 88b719c66a..2f52cc7acb 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/AbstractByteBufTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/AbstractByteBufTest.java
@@ -13,7 +13,28 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests.adaptor;
+package io.netty5.buffer.api.tests.adaptor;
+
+import static io.netty5.buffer.Unpooled.LITTLE_ENDIAN;
+import static io.netty5.buffer.Unpooled.buffer;
+import static io.netty5.buffer.Unpooled.copiedBuffer;
+import static io.netty5.buffer.Unpooled.directBuffer;
+import static io.netty5.buffer.Unpooled.unreleasableBuffer;
+import static io.netty5.buffer.Unpooled.wrappedBuffer;
+import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.ByteBufUtil;
@@ -21,10 +42,6 @@ import io.netty5.util.ByteProcessor;
import io.netty5.util.CharsetUtil;
import io.netty5.util.IllegalReferenceCountException;
import io.netty5.util.internal.PlatformDependent;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -53,27 +70,9 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static io.netty5.buffer.Unpooled.LITTLE_ENDIAN;
-import static io.netty5.buffer.Unpooled.buffer;
-import static io.netty5.buffer.Unpooled.copiedBuffer;
-import static io.netty5.buffer.Unpooled.directBuffer;
-import static io.netty5.buffer.Unpooled.unreleasableBuffer;
-import static io.netty5.buffer.Unpooled.wrappedBuffer;
-import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* An abstract test class for channel buffers
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/ByteBufAdaptorTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/ByteBufAdaptorTest.java
similarity index 98%
rename from buffer/src/test/java/io/netty/buffer/api/tests/adaptor/ByteBufAdaptorTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/ByteBufAdaptorTest.java
index e5c7d01f3f..03174af87b 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/ByteBufAdaptorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/ByteBufAdaptorTest.java
@@ -13,19 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests.adaptor;
+package io.netty5.buffer.api.tests.adaptor;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.api.BufferAllocator;
import io.netty5.buffer.api.MemoryManager;
import io.netty5.buffer.api.adaptor.ByteBufAllocatorAdaptor;
+import java.util.Optional;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Disabled;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
public abstract class ByteBufAdaptorTest extends AbstractByteBufTest {
static ByteBufAllocatorAdaptor alloc;
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java
index de0f4e14a7..51099a1612 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests.adaptor;
+package io.netty5.buffer.api.tests.adaptor;
import org.junit.jupiter.api.BeforeAll;
diff --git a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java
similarity index 95%
rename from buffer/src/test/java/io/netty/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java
rename to buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java
index ae5601354b..5eae4d193d 100644
--- a/buffer/src/test/java/io/netty/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.api.tests.adaptor;
+package io.netty5.buffer.api.tests.adaptor;
import org.junit.jupiter.api.BeforeAll;
diff --git a/buffer/src/test/java/io/netty/buffer/search/BitapSearchProcessorFactoryTest.java b/buffer/src/test/java/io/netty5/buffer/search/BitapSearchProcessorFactoryTest.java
similarity index 92%
rename from buffer/src/test/java/io/netty/buffer/search/BitapSearchProcessorFactoryTest.java
rename to buffer/src/test/java/io/netty5/buffer/search/BitapSearchProcessorFactoryTest.java
index 5fedd2dcc8..6fb43e509d 100644
--- a/buffer/src/test/java/io/netty/buffer/search/BitapSearchProcessorFactoryTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/search/BitapSearchProcessorFactoryTest.java
@@ -13,13 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.search;
-
-import io.netty5.buffer.search.BitapSearchProcessorFactory;
-import org.junit.jupiter.api.Test;
+package io.netty5.buffer.search;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class BitapSearchProcessorFactoryTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/search/MultiSearchProcessorTest.java b/buffer/src/test/java/io/netty5/buffer/search/MultiSearchProcessorTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/search/MultiSearchProcessorTest.java
rename to buffer/src/test/java/io/netty5/buffer/search/MultiSearchProcessorTest.java
index 6464fe4300..a071ee1a59 100644
--- a/buffer/src/test/java/io/netty/buffer/search/MultiSearchProcessorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/search/MultiSearchProcessorTest.java
@@ -13,17 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.search;
+package io.netty5.buffer.search;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.Unpooled;
import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.search.AbstractMultiSearchProcessorFactory;
-import io.netty5.buffer.search.MultiSearchProcessor;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class MultiSearchProcessorTest {
@Test
diff --git a/buffer/src/test/java/io/netty/buffer/search/SearchProcessorTest.java b/buffer/src/test/java/io/netty5/buffer/search/SearchProcessorTest.java
similarity index 96%
rename from buffer/src/test/java/io/netty/buffer/search/SearchProcessorTest.java
rename to buffer/src/test/java/io/netty5/buffer/search/SearchProcessorTest.java
index 3b6a63ff69..b749351cc2 100644
--- a/buffer/src/test/java/io/netty/buffer/search/SearchProcessorTest.java
+++ b/buffer/src/test/java/io/netty5/buffer/search/SearchProcessorTest.java
@@ -13,22 +13,17 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.buffer.search;
+package io.netty5.buffer.search;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import io.netty5.buffer.ByteBuf;
import io.netty5.buffer.Unpooled;
import io.netty5.util.CharsetUtil;
-import io.netty5.buffer.search.AbstractMultiSearchProcessorFactory;
-import io.netty5.buffer.search.AbstractSearchProcessorFactory;
-import io.netty5.buffer.search.SearchProcessor;
-import io.netty5.buffer.search.SearchProcessorFactory;
+import java.util.Arrays;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
-import java.util.Arrays;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class SearchProcessorTest {
private enum Algorithm {
diff --git a/common/pom.xml b/common/pom.xml
index 91de8cf8e8..4d41748ef8 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
4.0.0
- io.netty
+ io.netty5
netty-parent
5.0.0.Final-SNAPSHOT
@@ -30,7 +30,7 @@
Netty/Common
- io.netty.common
+ io.netty5.common
${project.basedir}/src/main/templates
${project.basedir}/src/test/templates
${project.build.directory}/generated-sources/collections/java
@@ -90,7 +90,7 @@
- io.netty
+ io.netty5
netty-dev-tools
test
true
@@ -116,7 +116,7 @@
org.jctools.
- io.netty.util.internal.shaded.org.jctools.
+ io.netty5.util.internal.shaded.org.jctools.
true
diff --git a/common/src/main/java/io/netty5/util/AbstractReferenceCounted.java b/common/src/main/java/io/netty5/util/AbstractReferenceCounted.java
index a6bcfb2f66..d19bc97e39 100644
--- a/common/src/main/java/io/netty5/util/AbstractReferenceCounted.java
+++ b/common/src/main/java/io/netty5/util/AbstractReferenceCounted.java
@@ -15,9 +15,8 @@
*/
package io.netty5.util;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-
import io.netty5.util.internal.ReferenceCountUpdater;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
/**
* Abstract base class for classes wants to implement {@link ReferenceCounted}.
diff --git a/common/src/main/java/io/netty5/util/AsciiString.java b/common/src/main/java/io/netty5/util/AsciiString.java
index 6f15a201b5..4d9441ea71 100644
--- a/common/src/main/java/io/netty5/util/AsciiString.java
+++ b/common/src/main/java/io/netty5/util/AsciiString.java
@@ -15,10 +15,12 @@
*/
package io.netty5.util;
+import static io.netty5.util.internal.MathUtil.isOutOfBounds;
+import static java.util.Objects.requireNonNull;
+
import io.netty5.util.internal.EmptyArrays;
import io.netty5.util.internal.InternalThreadLocalMap;
import io.netty5.util.internal.PlatformDependent;
-
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -29,9 +31,6 @@ import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import static io.netty5.util.internal.MathUtil.isOutOfBounds;
-import static java.util.Objects.requireNonNull;
-
/**
* A string which has been encoded into a character encoding whose character always takes a single byte, similarly to
* ASCII. It internally keeps its content in a byte array unlike {@link String}, which uses a character array, for
diff --git a/common/src/main/java/io/netty5/util/CharsetUtil.java b/common/src/main/java/io/netty5/util/CharsetUtil.java
index a6c7b8b16c..4f5b6f1684 100644
--- a/common/src/main/java/io/netty5/util/CharsetUtil.java
+++ b/common/src/main/java/io/netty5/util/CharsetUtil.java
@@ -15,9 +15,9 @@
*/
package io.netty5.util;
-import io.netty5.util.internal.InternalThreadLocalMap;
import static java.util.Objects.requireNonNull;
+import io.netty5.util.internal.InternalThreadLocalMap;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
diff --git a/common/src/main/java/io/netty5/util/DomainNameMapping.java b/common/src/main/java/io/netty5/util/DomainNameMapping.java
index 0d198cfe32..db7c058a6d 100644
--- a/common/src/main/java/io/netty5/util/DomainNameMapping.java
+++ b/common/src/main/java/io/netty5/util/DomainNameMapping.java
@@ -16,17 +16,16 @@
package io.netty5.util;
-import io.netty5.util.internal.StringUtil;
+import static io.netty5.util.internal.StringUtil.commonSuffixOfLength;
+import static java.util.Objects.requireNonNull;
+import io.netty5.util.internal.StringUtil;
import java.net.IDN;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
-import static io.netty5.util.internal.StringUtil.commonSuffixOfLength;
-import static java.util.Objects.requireNonNull;
-
/**
* Maps a domain name to its associated value object.
*
diff --git a/common/src/main/java/io/netty5/util/DomainNameMappingBuilder.java b/common/src/main/java/io/netty5/util/DomainNameMappingBuilder.java
index 96dbaf1e33..55d607097a 100644
--- a/common/src/main/java/io/netty5/util/DomainNameMappingBuilder.java
+++ b/common/src/main/java/io/netty5/util/DomainNameMappingBuilder.java
@@ -16,13 +16,13 @@
package io.netty5.util;
+import static java.util.Objects.requireNonNull;
+
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import static java.util.Objects.requireNonNull;
-
/**
* Builder for immutable {@link DomainNameMapping} instances.
*
diff --git a/common/src/main/java/io/netty5/util/DomainWildcardMappingBuilder.java b/common/src/main/java/io/netty5/util/DomainWildcardMappingBuilder.java
index 1b2d36d1ff..df174fa85e 100644
--- a/common/src/main/java/io/netty5/util/DomainWildcardMappingBuilder.java
+++ b/common/src/main/java/io/netty5/util/DomainWildcardMappingBuilder.java
@@ -15,11 +15,11 @@
*/
package io.netty5.util;
+import static io.netty5.util.internal.ObjectUtil.checkNotNull;
+
import java.util.LinkedHashMap;
import java.util.Map;
-import static io.netty5.util.internal.ObjectUtil.checkNotNull;
-
/**
* Builder that allows to build {@link Mapping}s that support
* DNS wildcard matching.
diff --git a/common/src/main/java/io/netty5/util/HashedWheelTimer.java b/common/src/main/java/io/netty5/util/HashedWheelTimer.java
index c0c193a0e8..faa9ddd392 100644
--- a/common/src/main/java/io/netty5/util/HashedWheelTimer.java
+++ b/common/src/main/java/io/netty5/util/HashedWheelTimer.java
@@ -15,10 +15,14 @@
*/
package io.netty5.util;
+import static io.netty5.util.internal.ObjectUtil.checkInRange;
+import static io.netty5.util.internal.ObjectUtil.checkPositive;
+import static io.netty5.util.internal.StringUtil.simpleClassName;
+import static java.util.Objects.requireNonNull;
+
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Queue;
@@ -33,11 +37,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLong;
-import static io.netty5.util.internal.ObjectUtil.checkInRange;
-import static io.netty5.util.internal.ObjectUtil.checkPositive;
-import static io.netty5.util.internal.StringUtil.simpleClassName;
-import static java.util.Objects.requireNonNull;
-
/**
* A {@link Timer} optimized for approximated I/O timeout scheduling.
*
diff --git a/common/src/main/java/io/netty5/util/NetUtil.java b/common/src/main/java/io/netty5/util/NetUtil.java
index 0e8c5e0ebc..8ddae5b595 100644
--- a/common/src/main/java/io/netty5/util/NetUtil.java
+++ b/common/src/main/java/io/netty5/util/NetUtil.java
@@ -15,13 +15,14 @@
*/
package io.netty5.util;
+import static io.netty5.util.AsciiString.indexOf;
+
import io.netty5.util.NetUtilInitializations.NetworkIfaceAndInetAddress;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.StringUtil;
import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -37,8 +38,6 @@ import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import static io.netty5.util.AsciiString.indexOf;
-
/**
* A class that holds a number of network-related constants.
*
diff --git a/common/src/main/java/io/netty5/util/NetUtilInitializations.java b/common/src/main/java/io/netty5/util/NetUtilInitializations.java
index 4ef8f4e8f4..32d3abc905 100644
--- a/common/src/main/java/io/netty5/util/NetUtilInitializations.java
+++ b/common/src/main/java/io/netty5/util/NetUtilInitializations.java
@@ -19,7 +19,6 @@ import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.SocketUtils;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
diff --git a/common/src/main/java/io/netty5/util/NetUtilSubstitutions.java b/common/src/main/java/io/netty5/util/NetUtilSubstitutions.java
index a6fad1ddc7..af076e6554 100644
--- a/common/src/main/java/io/netty5/util/NetUtilSubstitutions.java
+++ b/common/src/main/java/io/netty5/util/NetUtilSubstitutions.java
@@ -18,7 +18,6 @@ package io.netty5.util;
import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.InjectAccessors;
import com.oracle.svm.core.annotate.TargetClass;
-
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
diff --git a/common/src/main/java/io/netty5/util/NettyRuntime.java b/common/src/main/java/io/netty5/util/NettyRuntime.java
index 6b4c917471..f48ca04474 100644
--- a/common/src/main/java/io/netty5/util/NettyRuntime.java
+++ b/common/src/main/java/io/netty5/util/NettyRuntime.java
@@ -18,7 +18,6 @@ package io.netty5.util;
import io.netty5.util.internal.ObjectUtil;
import io.netty5.util.internal.SystemPropertyUtil;
-
import java.util.Locale;
/**
diff --git a/common/src/main/java/io/netty5/util/Recycler.java b/common/src/main/java/io/netty5/util/Recycler.java
index 05f8c65a4e..9a333a6f2a 100644
--- a/common/src/main/java/io/netty5/util/Recycler.java
+++ b/common/src/main/java/io/netty5/util/Recycler.java
@@ -16,12 +16,15 @@
package io.netty5.util;
+import static io.netty5.util.internal.MathUtil.safeFindNextPositivePowerOfTwo;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
import io.netty5.util.concurrent.FastThreadLocal;
import io.netty5.util.internal.ObjectPool;
import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.Map;
@@ -29,10 +32,6 @@ import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import static io.netty5.util.internal.MathUtil.safeFindNextPositivePowerOfTwo;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-
/**
* Light-weight object pool based on a thread-local stack.
*
diff --git a/common/src/main/java/io/netty5/util/ResourceLeakDetector.java b/common/src/main/java/io/netty5/util/ResourceLeakDetector.java
index 37f87ee4af..0f22bfe558 100644
--- a/common/src/main/java/io/netty5/util/ResourceLeakDetector.java
+++ b/common/src/main/java/io/netty5/util/ResourceLeakDetector.java
@@ -16,11 +16,15 @@
package io.netty5.util;
+import static io.netty5.util.internal.StringUtil.EMPTY_STRING;
+import static io.netty5.util.internal.StringUtil.NEWLINE;
+import static io.netty5.util.internal.StringUtil.simpleClassName;
+import static java.util.Objects.requireNonNull;
+
import io.netty5.util.internal.EmptyArrays;
import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
@@ -35,11 +39,6 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import static io.netty5.util.internal.StringUtil.EMPTY_STRING;
-import static io.netty5.util.internal.StringUtil.NEWLINE;
-import static io.netty5.util.internal.StringUtil.simpleClassName;
-import static java.util.Objects.requireNonNull;
-
public class ResourceLeakDetector {
private static final String PROP_LEVEL = "io.netty.leakDetection.level";
diff --git a/common/src/main/java/io/netty5/util/ResourceLeakDetectorFactory.java b/common/src/main/java/io/netty5/util/ResourceLeakDetectorFactory.java
index b5ba02b93f..c3a8d228d8 100644
--- a/common/src/main/java/io/netty5/util/ResourceLeakDetectorFactory.java
+++ b/common/src/main/java/io/netty5/util/ResourceLeakDetectorFactory.java
@@ -23,7 +23,6 @@ import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.reflect.Constructor;
/**
diff --git a/common/src/main/java/io/netty5/util/Version.java b/common/src/main/java/io/netty5/util/Version.java
index d27eb2a8d2..1e65f15d1a 100644
--- a/common/src/main/java/io/netty5/util/Version.java
+++ b/common/src/main/java/io/netty5/util/Version.java
@@ -17,7 +17,6 @@
package io.netty5.util;
import io.netty5.util.internal.PlatformDependent;
-
import java.io.InputStream;
import java.net.URL;
import java.text.ParseException;
diff --git a/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutor.java
index 808905ac95..a88343f378 100644
--- a/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutor.java
@@ -17,7 +17,6 @@ package io.netty5.util.concurrent;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
diff --git a/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutorGroup.java b/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutorGroup.java
index eb6735e0aa..77ed1bb790 100644
--- a/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutorGroup.java
+++ b/common/src/main/java/io/netty5/util/concurrent/AbstractEventExecutorGroup.java
@@ -15,6 +15,9 @@
*/
package io.netty5.util.concurrent;
+import static io.netty5.util.concurrent.AbstractEventExecutor.DEFAULT_SHUTDOWN_QUIET_PERIOD;
+import static io.netty5.util.concurrent.AbstractEventExecutor.DEFAULT_SHUTDOWN_TIMEOUT;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -23,8 +26,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import static io.netty5.util.concurrent.AbstractEventExecutor.*;
-
/**
* Abstract base class for {@link EventExecutorGroup} implementations.
diff --git a/common/src/main/java/io/netty5/util/concurrent/AbstractScheduledEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/AbstractScheduledEventExecutor.java
index 51907f8890..50a0e4e54b 100644
--- a/common/src/main/java/io/netty5/util/concurrent/AbstractScheduledEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/AbstractScheduledEventExecutor.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.DefaultPriorityQueue;
import io.netty5.util.internal.PriorityQueue;
import io.netty5.util.internal.PriorityQueueNode;
-
import java.util.Comparator;
import java.util.Queue;
import java.util.concurrent.Callable;
diff --git a/common/src/main/java/io/netty5/util/concurrent/DefaultFutureCompletionStage.java b/common/src/main/java/io/netty5/util/concurrent/DefaultFutureCompletionStage.java
index 1e4245db26..99f39d8ef9 100644
--- a/common/src/main/java/io/netty5/util/concurrent/DefaultFutureCompletionStage.java
+++ b/common/src/main/java/io/netty5/util/concurrent/DefaultFutureCompletionStage.java
@@ -16,6 +16,8 @@
package io.netty5.util.concurrent;
+import static java.util.Objects.requireNonNull;
+
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
@@ -25,8 +27,6 @@ import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
-import static java.util.Objects.requireNonNull;
-
/**
* Wraps a {@link Future} and provides a {@link FutureCompletionStage} implementation
* on top of it.
diff --git a/common/src/main/java/io/netty5/util/concurrent/DefaultFutureListeners.java b/common/src/main/java/io/netty5/util/concurrent/DefaultFutureListeners.java
index 41d3277109..68c2ebc2dd 100644
--- a/common/src/main/java/io/netty5/util/concurrent/DefaultFutureListeners.java
+++ b/common/src/main/java/io/netty5/util/concurrent/DefaultFutureListeners.java
@@ -16,7 +16,6 @@
package io.netty5.util.concurrent;
import io.netty5.util.internal.logging.InternalLogger;
-
import java.util.Arrays;
import java.util.EventListener;
diff --git a/common/src/main/java/io/netty5/util/concurrent/DefaultPromise.java b/common/src/main/java/io/netty5/util/concurrent/DefaultPromise.java
index 8f1f6579a0..070f36bf79 100644
--- a/common/src/main/java/io/netty5/util/concurrent/DefaultPromise.java
+++ b/common/src/main/java/io/netty5/util/concurrent/DefaultPromise.java
@@ -15,11 +15,13 @@
*/
package io.netty5.util.concurrent;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
import io.netty5.util.internal.StringUtil;
import io.netty5.util.internal.ThrowableUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
@@ -27,9 +29,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
public class DefaultPromise implements Promise, Future {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultPromise.class);
private static final InternalLogger rejectedExecutionLogger =
diff --git a/common/src/main/java/io/netty5/util/concurrent/DefaultThreadFactory.java b/common/src/main/java/io/netty5/util/concurrent/DefaultThreadFactory.java
index bfe906e960..78d439107d 100644
--- a/common/src/main/java/io/netty5/util/concurrent/DefaultThreadFactory.java
+++ b/common/src/main/java/io/netty5/util/concurrent/DefaultThreadFactory.java
@@ -19,7 +19,6 @@ package io.netty5.util.concurrent;
import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.StringUtil;
-
import java.util.Locale;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/common/src/main/java/io/netty5/util/concurrent/FastThreadLocal.java b/common/src/main/java/io/netty5/util/concurrent/FastThreadLocal.java
index 40a9bede39..eb360650b3 100644
--- a/common/src/main/java/io/netty5/util/concurrent/FastThreadLocal.java
+++ b/common/src/main/java/io/netty5/util/concurrent/FastThreadLocal.java
@@ -17,7 +17,6 @@ package io.netty5.util.concurrent;
import io.netty5.util.internal.InternalThreadLocalMap;
import io.netty5.util.internal.PlatformDependent;
-
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Set;
diff --git a/common/src/main/java/io/netty5/util/concurrent/FutureCompletionStage.java b/common/src/main/java/io/netty5/util/concurrent/FutureCompletionStage.java
index f6fbc747c8..34fc1a9d0e 100644
--- a/common/src/main/java/io/netty5/util/concurrent/FutureCompletionStage.java
+++ b/common/src/main/java/io/netty5/util/concurrent/FutureCompletionStage.java
@@ -16,7 +16,6 @@
package io.netty5.util.concurrent;
import io.netty5.util.internal.StringUtil;
-
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
diff --git a/common/src/main/java/io/netty5/util/concurrent/Futures.java b/common/src/main/java/io/netty5/util/concurrent/Futures.java
index 6d4dc491ff..7304768cd3 100644
--- a/common/src/main/java/io/netty5/util/concurrent/Futures.java
+++ b/common/src/main/java/io/netty5/util/concurrent/Futures.java
@@ -15,15 +15,14 @@
*/
package io.netty5.util.concurrent;
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.InternalLoggerFactory;
-
-import java.util.concurrent.Callable;
-import java.util.function.Function;
-
import static io.netty5.util.internal.PromiseNotificationUtil.tryFailure;
import static java.util.Objects.requireNonNull;
+import io.netty5.util.internal.logging.InternalLogger;
+import io.netty5.util.internal.logging.InternalLoggerFactory;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+
/**
* Combinator operations on {@linkplain Future futures}.
*
diff --git a/common/src/main/java/io/netty5/util/concurrent/GlobalEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/GlobalEventExecutor.java
index af22989d2d..968955aef4 100644
--- a/common/src/main/java/io/netty5/util/concurrent/GlobalEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/GlobalEventExecutor.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.ThreadExecutorMap;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Queue;
diff --git a/common/src/main/java/io/netty5/util/concurrent/ImmediateEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/ImmediateEventExecutor.java
index 7f4cba0bd2..1bb3cc533c 100644
--- a/common/src/main/java/io/netty5/util/concurrent/ImmediateEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/ImmediateEventExecutor.java
@@ -19,7 +19,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.concurrent.Callable;
diff --git a/common/src/main/java/io/netty5/util/concurrent/MultithreadEventExecutorGroup.java b/common/src/main/java/io/netty5/util/concurrent/MultithreadEventExecutorGroup.java
index a087b12186..3c468fdbbb 100644
--- a/common/src/main/java/io/netty5/util/concurrent/MultithreadEventExecutorGroup.java
+++ b/common/src/main/java/io/netty5/util/concurrent/MultithreadEventExecutorGroup.java
@@ -15,8 +15,9 @@
*/
package io.netty5.util.concurrent;
-import io.netty5.util.internal.EmptyArrays;
+import static io.netty5.util.internal.ObjectUtil.checkPositive;
+import io.netty5.util.internal.EmptyArrays;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@@ -27,8 +28,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import static io.netty5.util.internal.ObjectUtil.checkPositive;
-
/**
* {@link EventExecutorGroup} implementation that handles their tasks with multiple threads at
* the same time.
diff --git a/common/src/main/java/io/netty5/util/concurrent/NonStickyEventExecutorGroup.java b/common/src/main/java/io/netty5/util/concurrent/NonStickyEventExecutorGroup.java
index 60272db858..146c971965 100644
--- a/common/src/main/java/io/netty5/util/concurrent/NonStickyEventExecutorGroup.java
+++ b/common/src/main/java/io/netty5/util/concurrent/NonStickyEventExecutorGroup.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.UnstableApi;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
diff --git a/common/src/main/java/io/netty5/util/concurrent/RejectedExecutionHandlers.java b/common/src/main/java/io/netty5/util/concurrent/RejectedExecutionHandlers.java
index 5281703e5e..9ce5159745 100644
--- a/common/src/main/java/io/netty5/util/concurrent/RejectedExecutionHandlers.java
+++ b/common/src/main/java/io/netty5/util/concurrent/RejectedExecutionHandlers.java
@@ -16,7 +16,6 @@
package io.netty5.util.concurrent;
import io.netty5.util.internal.ObjectUtil;
-
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
diff --git a/common/src/main/java/io/netty5/util/concurrent/RunnableFutureAdapter.java b/common/src/main/java/io/netty5/util/concurrent/RunnableFutureAdapter.java
index 8d0683ec79..104bbe4250 100644
--- a/common/src/main/java/io/netty5/util/concurrent/RunnableFutureAdapter.java
+++ b/common/src/main/java/io/netty5/util/concurrent/RunnableFutureAdapter.java
@@ -18,7 +18,6 @@ package io.netty5.util.concurrent;
import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.StringUtil;
-
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
diff --git a/common/src/main/java/io/netty5/util/concurrent/RunnableScheduledFutureAdapter.java b/common/src/main/java/io/netty5/util/concurrent/RunnableScheduledFutureAdapter.java
index 15f45bda82..eafa920940 100644
--- a/common/src/main/java/io/netty5/util/concurrent/RunnableScheduledFutureAdapter.java
+++ b/common/src/main/java/io/netty5/util/concurrent/RunnableScheduledFutureAdapter.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.DefaultPriorityQueue;
import io.netty5.util.internal.StringUtil;
-
import java.util.concurrent.Callable;
import java.util.concurrent.Delayed;
import java.util.concurrent.ExecutionException;
diff --git a/common/src/main/java/io/netty5/util/concurrent/SingleThreadEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/SingleThreadEventExecutor.java
index 6b55a3d0f5..301b878978 100644
--- a/common/src/main/java/io/netty5/util/concurrent/SingleThreadEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/SingleThreadEventExecutor.java
@@ -15,11 +15,12 @@
*/
package io.netty5.util.concurrent;
+import static java.util.Objects.requireNonNull;
+
import io.netty5.util.internal.SystemPropertyUtil;
import io.netty5.util.internal.ThreadExecutorMap;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.Thread.State;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,8 +41,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import static java.util.Objects.requireNonNull;
-
/**
* {@link OrderedEventExecutor}'s implementation that execute all its submitted tasks in a single thread.
*
diff --git a/common/src/main/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutor.java b/common/src/main/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutor.java
index ed8198d30d..99c71b0e39 100644
--- a/common/src/main/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutor.java
+++ b/common/src/main/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutor.java
@@ -15,9 +15,10 @@
*/
package io.netty5.util.concurrent;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -30,8 +31,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
/**
* {@link EventExecutor} implementation which makes no guarantees about the ordering of task execution that
* are submitted because there may be multiple threads executing these tasks.
diff --git a/common/src/main/java/io/netty5/util/internal/AppendableCharSequence.java b/common/src/main/java/io/netty5/util/internal/AppendableCharSequence.java
index 2c7d83af03..4c08033b05 100644
--- a/common/src/main/java/io/netty5/util/internal/AppendableCharSequence.java
+++ b/common/src/main/java/io/netty5/util/internal/AppendableCharSequence.java
@@ -15,9 +15,6 @@
*/
package io.netty5.util.internal;
-import static io.netty5.util.internal.ObjectUtil.checkPositive;
-import static io.netty5.util.internal.ObjectUtil.checkNonEmpty;
-
import java.util.Arrays;
public final class AppendableCharSequence implements CharSequence, Appendable {
diff --git a/common/src/main/java/io/netty5/util/internal/CleanerJava9.java b/common/src/main/java/io/netty5/util/internal/CleanerJava9.java
index 5f568d9170..ea11f1d3a0 100644
--- a/common/src/main/java/io/netty5/util/internal/CleanerJava9.java
+++ b/common/src/main/java/io/netty5/util/internal/CleanerJava9.java
@@ -17,7 +17,6 @@ package io.netty5.util.internal;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
diff --git a/common/src/main/java/io/netty5/util/internal/DefaultPriorityQueue.java b/common/src/main/java/io/netty5/util/internal/DefaultPriorityQueue.java
index d4da288e77..841c7b25f6 100644
--- a/common/src/main/java/io/netty5/util/internal/DefaultPriorityQueue.java
+++ b/common/src/main/java/io/netty5/util/internal/DefaultPriorityQueue.java
@@ -15,14 +15,14 @@
*/
package io.netty5.util.internal;
+import static java.util.Objects.requireNonNull;
+
import java.util.AbstractQueue;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import static java.util.Objects.requireNonNull;
-
/**
* A priority queue which uses natural ordering of elements. Elements are also required to be of type
* {@link PriorityQueueNode} for the purpose of maintaining the index in the priority queue.
diff --git a/common/src/main/java/io/netty5/util/internal/EmptyArrays.java b/common/src/main/java/io/netty5/util/internal/EmptyArrays.java
index fb37246fe5..fd2872063f 100644
--- a/common/src/main/java/io/netty5/util/internal/EmptyArrays.java
+++ b/common/src/main/java/io/netty5/util/internal/EmptyArrays.java
@@ -17,7 +17,6 @@
package io.netty5.util.internal;
import io.netty5.util.AsciiString;
-
import java.nio.ByteBuffer;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
diff --git a/common/src/main/java/io/netty5/util/internal/Hidden.java b/common/src/main/java/io/netty5/util/internal/Hidden.java
index 01ff50182d..70508ec62c 100644
--- a/common/src/main/java/io/netty5/util/internal/Hidden.java
+++ b/common/src/main/java/io/netty5/util/internal/Hidden.java
@@ -38,69 +38,69 @@ class Hidden {
@Override
public void applyTo(BlockHound.Builder builder) {
builder.allowBlockingCallsInside(
- "io.netty.channel.nio.NioEventLoop",
+ "io.netty5.channel.nio.NioEventLoop",
"handleLoopException"
);
builder.allowBlockingCallsInside(
- "io.netty.channel.kqueue.KQueueEventLoop",
+ "io.netty5.channel.kqueue.KQueueEventLoop",
"handleLoopException"
);
builder.allowBlockingCallsInside(
- "io.netty.channel.epoll.EpollEventLoop",
+ "io.netty5.channel.epoll.EpollEventLoop",
"handleLoopException"
);
builder.allowBlockingCallsInside(
- "io.netty.util.HashedWheelTimer",
+ "io.netty5.util.HashedWheelTimer",
"start"
);
builder.allowBlockingCallsInside(
- "io.netty.util.HashedWheelTimer",
+ "io.netty5.util.HashedWheelTimer",
"stop"
);
builder.allowBlockingCallsInside(
- "io.netty.util.HashedWheelTimer$Worker",
+ "io.netty5.util.HashedWheelTimer$Worker",
"waitForNextTick"
);
builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.SingleThreadEventExecutor",
+ "io.netty5.util.concurrent.SingleThreadEventExecutor",
"confirmShutdown"
);
- builder.allowBlockingCallsInside("io.netty.util.concurrent.GlobalEventExecutor",
+ builder.allowBlockingCallsInside("io.netty5.util.concurrent.GlobalEventExecutor",
"addTask");
- builder.allowBlockingCallsInside("io.netty.util.concurrent.GlobalEventExecutor",
+ builder.allowBlockingCallsInside("io.netty5.util.concurrent.GlobalEventExecutor",
"takeTask");
builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.SingleThreadEventExecutor",
+ "io.netty5.util.concurrent.SingleThreadEventExecutor",
"addTask");
builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.SingleThreadEventExecutor",
+ "io.netty5.util.concurrent.SingleThreadEventExecutor",
"takeTask");
builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.SslHandler",
+ "io.netty5.handler.ssl.SslHandler",
"handshake"
);
builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.SslHandler",
+ "io.netty5.handler.ssl.SslHandler",
"runAllDelegatedTasks"
);
builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.SslHandler",
+ "io.netty5.handler.ssl.SslHandler",
"runDelegatedTasks"
);
builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.ReferenceCountedOpenSslClientContext$ExtendedTrustManagerVerifyCallback",
+ "io.netty5.handler.ssl.ReferenceCountedOpenSslClientContext$ExtendedTrustManagerVerifyCallback",
"verify");
// Let's whitelist SSLEngineImpl.unwrap(...) for now as it may fail otherwise for TLS 1.3.
@@ -114,19 +114,19 @@ class Hidden {
"wrap");
builder.allowBlockingCallsInside(
- "io.netty.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
+ "io.netty5.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
"parse");
builder.allowBlockingCallsInside(
- "io.netty.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
+ "io.netty5.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
"parseEtcResolverSearchDomains");
builder.allowBlockingCallsInside(
- "io.netty.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
+ "io.netty5.resolver.dns.UnixResolverDnsServerAddressStreamProvider",
"parseEtcResolverOptions");
builder.allowBlockingCallsInside(
- "io.netty.resolver.HostsFileEntriesProvider$ParserImpl",
+ "io.netty5.resolver.HostsFileEntriesProvider$ParserImpl",
"parse");
builder.nonBlockingThreadPredicate(p -> thread ->
diff --git a/common/src/main/java/io/netty5/util/internal/InternalThreadLocalMap.java b/common/src/main/java/io/netty5/util/internal/InternalThreadLocalMap.java
index 38de02b477..1d5b02b010 100644
--- a/common/src/main/java/io/netty5/util/internal/InternalThreadLocalMap.java
+++ b/common/src/main/java/io/netty5/util/internal/InternalThreadLocalMap.java
@@ -20,7 +20,6 @@ import io.netty5.util.concurrent.FastThreadLocal;
import io.netty5.util.concurrent.FastThreadLocalThread;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
diff --git a/common/src/main/java/io/netty5/util/internal/MacAddressUtil.java b/common/src/main/java/io/netty5/util/internal/MacAddressUtil.java
index 8901b9c32d..38aa759406 100644
--- a/common/src/main/java/io/netty5/util/internal/MacAddressUtil.java
+++ b/common/src/main/java/io/netty5/util/internal/MacAddressUtil.java
@@ -19,7 +19,6 @@ package io.netty5.util.internal;
import io.netty5.util.NetUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
diff --git a/common/src/main/java/io/netty5/util/internal/NativeLibraryLoader.java b/common/src/main/java/io/netty5/util/internal/NativeLibraryLoader.java
index 9a6775f807..a704e7128a 100644
--- a/common/src/main/java/io/netty5/util/internal/NativeLibraryLoader.java
+++ b/common/src/main/java/io/netty5/util/internal/NativeLibraryLoader.java
@@ -18,7 +18,6 @@ package io.netty5.util.internal;
import io.netty5.util.CharsetUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
diff --git a/common/src/main/java/io/netty5/util/internal/ObjectCleaner.java b/common/src/main/java/io/netty5/util/internal/ObjectCleaner.java
index 4d63904207..737cae46e4 100644
--- a/common/src/main/java/io/netty5/util/internal/ObjectCleaner.java
+++ b/common/src/main/java/io/netty5/util/internal/ObjectCleaner.java
@@ -15,8 +15,9 @@
*/
package io.netty5.util.internal;
-import io.netty5.util.concurrent.FastThreadLocalThread;
+import static java.util.Objects.requireNonNull;
+import io.netty5.util.concurrent.FastThreadLocalThread;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.security.AccessController;
@@ -25,9 +26,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import static java.lang.Math.max;
-import static java.util.Objects.requireNonNull;
-
/**
* Allows a way to register some {@link Runnable} that will executed once there are no references to an {@link Object}
* anymore.
diff --git a/common/src/main/java/io/netty5/util/internal/ObjectPool.java b/common/src/main/java/io/netty5/util/internal/ObjectPool.java
index cf0dbf7582..285258c7e2 100644
--- a/common/src/main/java/io/netty5/util/internal/ObjectPool.java
+++ b/common/src/main/java/io/netty5/util/internal/ObjectPool.java
@@ -16,7 +16,6 @@
package io.netty5.util.internal;
import io.netty5.util.Recycler;
-
import java.util.Objects;
/**
diff --git a/common/src/main/java/io/netty5/util/internal/ObjectUtil.java b/common/src/main/java/io/netty5/util/internal/ObjectUtil.java
index 666babd467..364c234223 100644
--- a/common/src/main/java/io/netty5/util/internal/ObjectUtil.java
+++ b/common/src/main/java/io/netty5/util/internal/ObjectUtil.java
@@ -17,8 +17,8 @@ package io.netty5.util.internal;
import static java.util.Objects.requireNonNull;
import java.util.Collection;
-import java.util.Objects;
import java.util.Map;
+import java.util.Objects;
/**
* A grab-bag of useful utility methods.
diff --git a/common/src/main/java/io/netty5/util/internal/PlatformDependent.java b/common/src/main/java/io/netty5/util/internal/PlatformDependent.java
index 2cea70a3df..fd377a3298 100644
--- a/common/src/main/java/io/netty5/util/internal/PlatformDependent.java
+++ b/common/src/main/java/io/netty5/util/internal/PlatformDependent.java
@@ -15,20 +15,17 @@
*/
package io.netty5.util.internal;
+import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_ASCII_SEED;
+import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_C1;
+import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_C2;
+import static io.netty5.util.internal.PlatformDependent0.hashCodeAsciiSanitize;
+import static io.netty5.util.internal.PlatformDependent0.unalignedAccess;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
import io.netty5.util.CharsetUtil;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-import org.jctools.queues.MpscArrayQueue;
-import org.jctools.queues.MpscChunkedArrayQueue;
-import org.jctools.queues.MpscUnboundedArrayQueue;
-import org.jctools.queues.SpscLinkedQueue;
-import org.jctools.queues.atomic.MpscAtomicArrayQueue;
-import org.jctools.queues.atomic.MpscChunkedAtomicArrayQueue;
-import org.jctools.queues.atomic.MpscUnboundedAtomicArrayQueue;
-import org.jctools.queues.atomic.SpscLinkedAtomicQueue;
-import org.jctools.util.Pow2;
-import org.jctools.util.UnsafeAccess;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -54,14 +51,16 @@ import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
-import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_ASCII_SEED;
-import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_C1;
-import static io.netty5.util.internal.PlatformDependent0.HASH_CODE_C2;
-import static io.netty5.util.internal.PlatformDependent0.hashCodeAsciiSanitize;
-import static io.netty5.util.internal.PlatformDependent0.unalignedAccess;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
+import org.jctools.queues.MpscArrayQueue;
+import org.jctools.queues.MpscChunkedArrayQueue;
+import org.jctools.queues.MpscUnboundedArrayQueue;
+import org.jctools.queues.SpscLinkedQueue;
+import org.jctools.queues.atomic.MpscAtomicArrayQueue;
+import org.jctools.queues.atomic.MpscChunkedAtomicArrayQueue;
+import org.jctools.queues.atomic.MpscUnboundedAtomicArrayQueue;
+import org.jctools.queues.atomic.SpscLinkedAtomicQueue;
+import org.jctools.util.Pow2;
+import org.jctools.util.UnsafeAccess;
/**
* Utility that detects various properties specific to the current runtime
diff --git a/common/src/main/java/io/netty5/util/internal/PlatformDependent0.java b/common/src/main/java/io/netty5/util/internal/PlatformDependent0.java
index 2b808f4e22..f858657680 100644
--- a/common/src/main/java/io/netty5/util/internal/PlatformDependent0.java
+++ b/common/src/main/java/io/netty5/util/internal/PlatformDependent0.java
@@ -17,8 +17,6 @@ package io.netty5.util.internal;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-import sun.misc.Unsafe;
-
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
@@ -30,6 +28,7 @@ import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import sun.misc.Unsafe;
/**
* The {@link PlatformDependent} operations which requires access to {@code sun.misc.*}.
diff --git a/common/src/main/java/io/netty5/util/internal/RecyclableArrayList.java b/common/src/main/java/io/netty5/util/internal/RecyclableArrayList.java
index 0f626394ff..e7d2c01720 100644
--- a/common/src/main/java/io/netty5/util/internal/RecyclableArrayList.java
+++ b/common/src/main/java/io/netty5/util/internal/RecyclableArrayList.java
@@ -19,7 +19,6 @@ package io.netty5.util.internal;
import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.ObjectPool.Handle;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/common/src/main/java/io/netty5/util/internal/ReferenceCountUpdater.java b/common/src/main/java/io/netty5/util/internal/ReferenceCountUpdater.java
index 3a83a2b7f1..333289f5b5 100644
--- a/common/src/main/java/io/netty5/util/internal/ReferenceCountUpdater.java
+++ b/common/src/main/java/io/netty5/util/internal/ReferenceCountUpdater.java
@@ -15,8 +15,6 @@
*/
package io.netty5.util.internal;
-import static io.netty5.util.internal.ObjectUtil.checkPositive;
-
import io.netty5.util.IllegalReferenceCountException;
import io.netty5.util.ReferenceCounted;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
diff --git a/common/src/main/java/io/netty5/util/internal/StringUtil.java b/common/src/main/java/io/netty5/util/internal/StringUtil.java
index ab13e44959..31c721e792 100644
--- a/common/src/main/java/io/netty5/util/internal/StringUtil.java
+++ b/common/src/main/java/io/netty5/util/internal/StringUtil.java
@@ -15,6 +15,8 @@
*/
package io.netty5.util.internal;
+import static java.util.Objects.requireNonNull;
+
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
@@ -22,8 +24,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import static java.util.Objects.requireNonNull;
-
/**
* String utility class.
*/
diff --git a/common/src/main/java/io/netty5/util/internal/SystemPropertyUtil.java b/common/src/main/java/io/netty5/util/internal/SystemPropertyUtil.java
index c99c917a53..c52d711c64 100644
--- a/common/src/main/java/io/netty5/util/internal/SystemPropertyUtil.java
+++ b/common/src/main/java/io/netty5/util/internal/SystemPropertyUtil.java
@@ -19,7 +19,6 @@ import static io.netty5.util.internal.ObjectUtil.checkNonEmpty;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-
import java.security.AccessController;
import java.security.PrivilegedAction;
diff --git a/common/src/main/java/io/netty5/util/internal/ThreadExecutorMap.java b/common/src/main/java/io/netty5/util/internal/ThreadExecutorMap.java
index f13044f32c..e0dc6c7fab 100644
--- a/common/src/main/java/io/netty5/util/internal/ThreadExecutorMap.java
+++ b/common/src/main/java/io/netty5/util/internal/ThreadExecutorMap.java
@@ -17,7 +17,6 @@ package io.netty5.util.internal;
import io.netty5.util.concurrent.EventExecutor;
import io.netty5.util.concurrent.FastThreadLocal;
-
import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadFactory;
diff --git a/common/src/main/java/io/netty5/util/internal/logging/AbstractInternalLogger.java b/common/src/main/java/io/netty5/util/internal/logging/AbstractInternalLogger.java
index 22db53855b..15d6b3caf5 100644
--- a/common/src/main/java/io/netty5/util/internal/logging/AbstractInternalLogger.java
+++ b/common/src/main/java/io/netty5/util/internal/logging/AbstractInternalLogger.java
@@ -18,7 +18,6 @@ package io.netty5.util.internal.logging;
import static java.util.Objects.requireNonNull;
import io.netty5.util.internal.StringUtil;
-
import java.io.ObjectStreamException;
import java.io.Serializable;
diff --git a/common/src/main/java/io/netty5/util/internal/logging/LocationAwareSlf4JLogger.java b/common/src/main/java/io/netty5/util/internal/logging/LocationAwareSlf4JLogger.java
index 90f98776f1..daa84bd555 100644
--- a/common/src/main/java/io/netty5/util/internal/logging/LocationAwareSlf4JLogger.java
+++ b/common/src/main/java/io/netty5/util/internal/logging/LocationAwareSlf4JLogger.java
@@ -15,9 +15,13 @@
*/
package io.netty5.util.internal.logging;
-import org.slf4j.spi.LocationAwareLogger;
+import static org.slf4j.spi.LocationAwareLogger.DEBUG_INT;
+import static org.slf4j.spi.LocationAwareLogger.ERROR_INT;
+import static org.slf4j.spi.LocationAwareLogger.INFO_INT;
+import static org.slf4j.spi.LocationAwareLogger.TRACE_INT;
+import static org.slf4j.spi.LocationAwareLogger.WARN_INT;
-import static org.slf4j.spi.LocationAwareLogger.*;
+import org.slf4j.spi.LocationAwareLogger;
/**
* SLF4J logger which is location aware and so will log the correct origin of the
diff --git a/common/src/main/java/io/netty5/util/internal/logging/Log4J2Logger.java b/common/src/main/java/io/netty5/util/internal/logging/Log4J2Logger.java
index f0214db111..3179520571 100644
--- a/common/src/main/java/io/netty5/util/internal/logging/Log4J2Logger.java
+++ b/common/src/main/java/io/netty5/util/internal/logging/Log4J2Logger.java
@@ -16,16 +16,15 @@
package io.netty5.util.internal.logging;
+import static io.netty5.util.internal.logging.AbstractInternalLogger.EXCEPTION_MESSAGE;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import static io.netty5.util.internal.logging.AbstractInternalLogger.EXCEPTION_MESSAGE;
-
class Log4J2Logger extends ExtendedLoggerWrapper implements InternalLogger {
private static final long serialVersionUID = 5485418394879791397L;
diff --git a/common/src/main/java/io/netty5/util/internal/svm/PlatformDependent0Substitution.java b/common/src/main/java/io/netty5/util/internal/svm/PlatformDependent0Substitution.java
index 54a274fdd7..8128690fb1 100644
--- a/common/src/main/java/io/netty5/util/internal/svm/PlatformDependent0Substitution.java
+++ b/common/src/main/java/io/netty5/util/internal/svm/PlatformDependent0Substitution.java
@@ -19,7 +19,7 @@ import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.RecomputeFieldValue;
import com.oracle.svm.core.annotate.TargetClass;
-@TargetClass(className = "io.netty.util.internal.PlatformDependent0")
+@TargetClass(className = "io.netty5.util.internal.PlatformDependent0")
final class PlatformDependent0Substitution {
private PlatformDependent0Substitution() {
}
diff --git a/common/src/main/java/io/netty5/util/internal/svm/PlatformDependentSubstitution.java b/common/src/main/java/io/netty5/util/internal/svm/PlatformDependentSubstitution.java
index 7809025b03..df5130864d 100644
--- a/common/src/main/java/io/netty5/util/internal/svm/PlatformDependentSubstitution.java
+++ b/common/src/main/java/io/netty5/util/internal/svm/PlatformDependentSubstitution.java
@@ -19,7 +19,7 @@ import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.RecomputeFieldValue;
import com.oracle.svm.core.annotate.TargetClass;
-@TargetClass(className = "io.netty.util.internal.PlatformDependent")
+@TargetClass(className = "io.netty5.util.internal.PlatformDependent")
final class PlatformDependentSubstitution {
private PlatformDependentSubstitution() {
}
diff --git a/common/src/main/java/io/netty5/util/internal/svm/UnsafeRefArrayAccessSubstitution.java b/common/src/main/java/io/netty5/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
index e6d0e8bea7..ac77b52f4e 100644
--- a/common/src/main/java/io/netty5/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
+++ b/common/src/main/java/io/netty5/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
@@ -19,7 +19,7 @@ import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.RecomputeFieldValue;
import com.oracle.svm.core.annotate.TargetClass;
-@TargetClass(className = "io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess")
+@TargetClass(className = "io.netty5.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess")
final class UnsafeRefArrayAccessSubstitution {
private UnsafeRefArrayAccessSubstitution() {
}
diff --git a/common/src/main/resources/META-INF/native-image/io.netty/common/native-image.properties b/common/src/main/resources/META-INF/native-image/io.netty5/common/native-image.properties
similarity index 100%
rename from common/src/main/resources/META-INF/native-image/io.netty/common/native-image.properties
rename to common/src/main/resources/META-INF/native-image/io.netty5/common/native-image.properties
diff --git a/common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration b/common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration
index e33bea796c..465fdec59f 100644
--- a/common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration
+++ b/common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration
@@ -11,4 +11,4 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-io.netty.util.internal.Hidden$NettyBlockHoundIntegration
\ No newline at end of file
+io.netty5.util.internal.Hidden$NettyBlockHoundIntegration
\ No newline at end of file
diff --git a/common/src/main/templates/io/netty/util/collection/KCollections.template b/common/src/main/templates/io/netty5/util/collection/KCollections.template
similarity index 99%
rename from common/src/main/templates/io/netty/util/collection/KCollections.template
rename to common/src/main/templates/io/netty5/util/collection/KCollections.template
index 5a7db526fe..9adcd08e32 100644
--- a/common/src/main/templates/io/netty/util/collection/KCollections.template
+++ b/common/src/main/templates/io/netty5/util/collection/KCollections.template
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package io.netty.util.collection;
+package io.netty5.util.collection;
import java.util.Collection;
import java.util.Collections;
diff --git a/common/src/main/templates/io/netty/util/collection/KObjectHashMap.template b/common/src/main/templates/io/netty5/util/collection/KObjectHashMap.template
similarity index 99%
rename from common/src/main/templates/io/netty/util/collection/KObjectHashMap.template
rename to common/src/main/templates/io/netty5/util/collection/KObjectHashMap.template
index a130cc87c4..5a63cffbac 100644
--- a/common/src/main/templates/io/netty/util/collection/KObjectHashMap.template
+++ b/common/src/main/templates/io/netty5/util/collection/KObjectHashMap.template
@@ -13,9 +13,9 @@
* the License.
*/
-package io.netty.util.collection;
+package io.netty5.util.collection;
-import static io.netty.util.internal.MathUtil.safeFindNextPositivePowerOfTwo;
+import static io.netty5.util.internal.MathUtil.safeFindNextPositivePowerOfTwo;
import java.util.AbstractCollection;
import java.util.AbstractSet;
diff --git a/common/src/main/templates/io/netty/util/collection/KObjectMap.template b/common/src/main/templates/io/netty5/util/collection/KObjectMap.template
similarity index 98%
rename from common/src/main/templates/io/netty/util/collection/KObjectMap.template
rename to common/src/main/templates/io/netty5/util/collection/KObjectMap.template
index 4af9be1958..d06f423b75 100644
--- a/common/src/main/templates/io/netty/util/collection/KObjectMap.template
+++ b/common/src/main/templates/io/netty5/util/collection/KObjectMap.template
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package io.netty.util.collection;
+package io.netty5.util.collection;
import java.util.Map;
diff --git a/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java b/common/src/test/java/io/netty5/util/AbstractReferenceCountedTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java
rename to common/src/test/java/io/netty5/util/AbstractReferenceCountedTest.java
index 795a882171..a99551e148 100644
--- a/common/src/test/java/io/netty/util/AbstractReferenceCountedTest.java
+++ b/common/src/test/java/io/netty5/util/AbstractReferenceCountedTest.java
@@ -13,13 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
-import io.netty5.util.AbstractReferenceCounted;
-import io.netty5.util.IllegalReferenceCountException;
-import io.netty5.util.ReferenceCounted;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayDeque;
import java.util.Queue;
@@ -30,11 +29,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class AbstractReferenceCountedTest {
diff --git a/common/src/test/java/io/netty/util/AsciiStringCharacterTest.java b/common/src/test/java/io/netty5/util/AsciiStringCharacterTest.java
similarity index 99%
rename from common/src/test/java/io/netty/util/AsciiStringCharacterTest.java
rename to common/src/test/java/io/netty5/util/AsciiStringCharacterTest.java
index 979a185c81..6f5a2408a1 100644
--- a/common/src/test/java/io/netty/util/AsciiStringCharacterTest.java
+++ b/common/src/test/java/io/netty5/util/AsciiStringCharacterTest.java
@@ -13,14 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.AsciiString;
-import org.junit.jupiter.api.Test;
-
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.util.Random;
+package io.netty5.util;
import static io.netty5.util.AsciiString.contains;
import static io.netty5.util.AsciiString.containsIgnoreCase;
@@ -38,6 +31,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.Random;
+import org.junit.jupiter.api.Test;
+
/**
* Test character encoding and case insensitivity for the {@link AsciiString} class
*/
diff --git a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java b/common/src/test/java/io/netty5/util/AsciiStringMemoryTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/AsciiStringMemoryTest.java
rename to common/src/test/java/io/netty5/util/AsciiStringMemoryTest.java
index 1822e424c9..129da0819e 100644
--- a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java
+++ b/common/src/test/java/io/netty5/util/AsciiStringMemoryTest.java
@@ -13,18 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import io.netty5.util.AsciiString;
-import io.netty5.util.ByteProcessor;
import io.netty5.util.ByteProcessor.IndexOfProcessor;
-
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/common/src/test/java/io/netty/util/AttributeKeyTest.java b/common/src/test/java/io/netty5/util/AttributeKeyTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/AttributeKeyTest.java
rename to common/src/test/java/io/netty5/util/AttributeKeyTest.java
index 94a935a87f..59f4bd52f0 100644
--- a/common/src/test/java/io/netty/util/AttributeKeyTest.java
+++ b/common/src/test/java/io/netty5/util/AttributeKeyTest.java
@@ -13,10 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.AttributeKey;
-import org.junit.jupiter.api.Test;
+package io.netty5.util;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -24,6 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class AttributeKeyTest {
@Test
diff --git a/common/src/test/java/io/netty/util/ConstantPoolTest.java b/common/src/test/java/io/netty5/util/ConstantPoolTest.java
similarity index 94%
rename from common/src/test/java/io/netty/util/ConstantPoolTest.java
rename to common/src/test/java/io/netty5/util/ConstantPoolTest.java
index ceb3b3f689..4c2c6b2ac8 100644
--- a/common/src/test/java/io/netty/util/ConstantPoolTest.java
+++ b/common/src/test/java/io/netty5/util/ConstantPoolTest.java
@@ -13,19 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
-import io.netty5.util.AbstractConstant;
-import io.netty5.util.ConstantPool;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
public class ConstantPoolTest {
diff --git a/common/src/test/java/io/netty/util/DefaultAttributeMapTest.java b/common/src/test/java/io/netty5/util/DefaultAttributeMapTest.java
similarity index 96%
rename from common/src/test/java/io/netty/util/DefaultAttributeMapTest.java
rename to common/src/test/java/io/netty5/util/DefaultAttributeMapTest.java
index d1b42404cb..836e8e65ca 100644
--- a/common/src/test/java/io/netty/util/DefaultAttributeMapTest.java
+++ b/common/src/test/java/io/netty5/util/DefaultAttributeMapTest.java
@@ -13,13 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.Attribute;
-import io.netty5.util.AttributeKey;
-import io.netty5.util.DefaultAttributeMap;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+package io.netty5.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -29,6 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class DefaultAttributeMapTest {
private DefaultAttributeMap map;
diff --git a/common/src/test/java/io/netty/util/DomainNameMappingTest.java b/common/src/test/java/io/netty5/util/DomainNameMappingTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/DomainNameMappingTest.java
rename to common/src/test/java/io/netty5/util/DomainNameMappingTest.java
index 7c5091c6a7..529f82739a 100644
--- a/common/src/test/java/io/netty/util/DomainNameMappingTest.java
+++ b/common/src/test/java/io/netty5/util/DomainNameMappingTest.java
@@ -14,17 +14,14 @@
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.DomainNameMapping;
-import io.netty5.util.DomainNameMappingBuilder;
-import org.junit.jupiter.api.Test;
-
-import java.util.Map;
+package io.netty5.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
@SuppressWarnings("deprecation")
public class DomainNameMappingTest {
diff --git a/common/src/test/java/io/netty/util/DomainWildcardMappingBuilderTest.java b/common/src/test/java/io/netty5/util/DomainWildcardMappingBuilderTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/DomainWildcardMappingBuilderTest.java
rename to common/src/test/java/io/netty5/util/DomainWildcardMappingBuilderTest.java
index 4d5d6b862a..30aedf3fe8 100644
--- a/common/src/test/java/io/netty/util/DomainWildcardMappingBuilderTest.java
+++ b/common/src/test/java/io/netty5/util/DomainWildcardMappingBuilderTest.java
@@ -14,15 +14,13 @@
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.DomainWildcardMappingBuilder;
-import io.netty5.util.Mapping;
-import org.junit.jupiter.api.Test;
+package io.netty5.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class DomainWildcardMappingBuilderTest {
@Test
diff --git a/common/src/test/java/io/netty/util/HashedWheelTimerTest.java b/common/src/test/java/io/netty5/util/HashedWheelTimerTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/HashedWheelTimerTest.java
rename to common/src/test/java/io/netty5/util/HashedWheelTimerTest.java
index 09609c7afb..30cef30bf4 100644
--- a/common/src/test/java/io/netty/util/HashedWheelTimerTest.java
+++ b/common/src/test/java/io/netty5/util/HashedWheelTimerTest.java
@@ -13,13 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
-import io.netty5.util.HashedWheelTimer;
-import io.netty5.util.Timeout;
-import io.netty5.util.Timer;
-import io.netty5.util.TimerTask;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
@@ -27,11 +26,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class HashedWheelTimerTest {
diff --git a/common/src/test/java/io/netty/util/NetUtilTest.java b/common/src/test/java/io/netty5/util/NetUtilTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/NetUtilTest.java
rename to common/src/test/java/io/netty5/util/NetUtilTest.java
index c6be41148f..5eff9fc76e 100644
--- a/common/src/test/java/io/netty/util/NetUtilTest.java
+++ b/common/src/test/java/io/netty5/util/NetUtilTest.java
@@ -13,11 +13,26 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
+
+import static io.netty5.util.NetUtil.LOCALHOST;
+import static io.netty5.util.NetUtil.LOOPBACK_IF;
+import static io.netty5.util.NetUtil.bytesToIpAddress;
+import static io.netty5.util.NetUtil.createByteArrayFromIpAddressString;
+import static io.netty5.util.NetUtil.getByName;
+import static io.netty5.util.NetUtil.ipv4AddressToInt;
+import static io.netty5.util.NetUtil.isValidIpV4Address;
+import static io.netty5.util.NetUtil.isValidIpV6Address;
+import static io.netty5.util.NetUtil.toAddressString;
+import static io.netty5.util.NetUtil.toSocketAddressString;
+import static io.netty5.util.NetUtil.validIpV4ToBytes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.netty5.util.internal.StringUtil;
-import org.junit.jupiter.api.Test;
-
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -26,13 +41,7 @@ import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-
-import static io.netty5.util.NetUtil.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
public class NetUtilTest {
diff --git a/common/src/test/java/io/netty/util/NettyRuntimeTests.java b/common/src/test/java/io/netty5/util/NettyRuntimeTests.java
similarity index 98%
rename from common/src/test/java/io/netty/util/NettyRuntimeTests.java
rename to common/src/test/java/io/netty5/util/NettyRuntimeTests.java
index 47c0be9cbf..2f57b7d968 100644
--- a/common/src/test/java/io/netty/util/NettyRuntimeTests.java
+++ b/common/src/test/java/io/netty5/util/NettyRuntimeTests.java
@@ -14,16 +14,7 @@
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.NettyRuntime;
-import io.netty5.util.SuppressForbidden;
-import io.netty5.util.internal.SystemPropertyUtil;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicReference;
+package io.netty5.util;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -33,6 +24,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
+import io.netty5.util.internal.SystemPropertyUtil;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Test;
+
public class NettyRuntimeTests {
@Test
diff --git a/common/src/test/java/io/netty/util/RecyclerTest.java b/common/src/test/java/io/netty5/util/RecyclerTest.java
similarity index 99%
rename from common/src/test/java/io/netty/util/RecyclerTest.java
rename to common/src/test/java/io/netty5/util/RecyclerTest.java
index ee7dd30c60..82dabe20db 100644
--- a/common/src/test/java/io/netty/util/RecyclerTest.java
+++ b/common/src/test/java/io/netty5/util/RecyclerTest.java
@@ -13,11 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
+package io.netty5.util;
-import io.netty5.util.Recycler;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
@@ -27,14 +31,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class RecyclerTest {
diff --git a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java b/common/src/test/java/io/netty5/util/ResourceLeakDetectorTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java
rename to common/src/test/java/io/netty5/util/ResourceLeakDetectorTest.java
index fb2a1ac8bb..cc73ecc242 100644
--- a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java
+++ b/common/src/test/java/io/netty5/util/ResourceLeakDetectorTest.java
@@ -13,12 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util;
-
-import io.netty5.util.ResourceLeakDetector;
-import io.netty5.util.ResourceLeakTracker;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
+package io.netty5.util;
import java.util.ArrayDeque;
import java.util.Queue;
@@ -26,6 +21,8 @@ import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class ResourceLeakDetectorTest {
diff --git a/common/src/test/java/io/netty/util/concurrent/AbstractScheduledEventExecutorTest.java b/common/src/test/java/io/netty5/util/concurrent/AbstractScheduledEventExecutorTest.java
similarity index 96%
rename from common/src/test/java/io/netty/util/concurrent/AbstractScheduledEventExecutorTest.java
rename to common/src/test/java/io/netty5/util/concurrent/AbstractScheduledEventExecutorTest.java
index 580e94b789..929fff1905 100644
--- a/common/src/test/java/io/netty/util/concurrent/AbstractScheduledEventExecutorTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/AbstractScheduledEventExecutorTest.java
@@ -13,22 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.AbstractScheduledEventExecutor;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.ScheduledFuture;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+package io.netty5.util.concurrent;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+
public class AbstractScheduledEventExecutorTest {
private static final Runnable TEST_RUNNABLE = () -> {
};
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultFutureCompletionStageTest.java b/common/src/test/java/io/netty5/util/concurrent/DefaultFutureCompletionStageTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/concurrent/DefaultFutureCompletionStageTest.java
rename to common/src/test/java/io/netty5/util/concurrent/DefaultFutureCompletionStageTest.java
index bd09bbd2ed..d7b95cc262 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultFutureCompletionStageTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/DefaultFutureCompletionStageTest.java
@@ -13,18 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
-import io.netty5.util.concurrent.DefaultFutureCompletionStage;
-import io.netty5.util.concurrent.EventExecutor;
-import io.netty5.util.concurrent.EventExecutorGroup;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.FutureCompletionStage;
-import io.netty5.util.concurrent.MultithreadEventExecutorGroup;
-import io.netty5.util.concurrent.Promise;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Collections;
@@ -36,14 +33,9 @@ import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.BiFunction;
import java.util.function.Function;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class DefaultFutureCompletionStageTest {
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java b/common/src/test/java/io/netty5/util/concurrent/DefaultPromiseTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
rename to common/src/test/java/io/netty5/util/concurrent/DefaultPromiseTest.java
index c95ea6054b..24fcc927b7 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/DefaultPromiseTest.java
@@ -14,23 +14,22 @@
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
+
+import static io.netty5.util.concurrent.ImmediateEventExecutor.INSTANCE;
+import static java.lang.Math.max;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.util.Signal;
-import io.netty5.util.concurrent.AbstractEventExecutor;
-import io.netty5.util.concurrent.DefaultPromise;
-import io.netty5.util.concurrent.EventExecutor;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.FutureListener;
-import io.netty5.util.concurrent.GlobalEventExecutor;
-import io.netty5.util.concurrent.ScheduledFuture;
-import io.netty5.util.concurrent.SingleThreadEventExecutor;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -45,17 +44,9 @@ import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
-import static io.netty5.util.concurrent.ImmediateEventExecutor.INSTANCE;
-import static java.lang.Math.max;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class DefaultPromiseTest {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultPromiseTest.class);
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java b/common/src/test/java/io/netty5/util/concurrent/DefaultThreadFactoryTest.java
similarity index 99%
rename from common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java
rename to common/src/test/java/io/netty5/util/concurrent/DefaultThreadFactoryTest.java
index 0e67e66b64..efa729eb7c 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultThreadFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/DefaultThreadFactoryTest.java
@@ -14,22 +14,20 @@
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
-import io.netty5.util.concurrent.DefaultThreadFactory;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.security.Permission;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class DefaultThreadFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java b/common/src/test/java/io/netty5/util/concurrent/FastThreadLocalTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java
rename to common/src/test/java/io/netty5/util/concurrent/FastThreadLocalTest.java
index 346f7840f7..26569b11af 100644
--- a/common/src/test/java/io/netty/util/concurrent/FastThreadLocalTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/FastThreadLocalTest.java
@@ -14,19 +14,7 @@
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.FastThreadLocal;
-import io.netty5.util.concurrent.FastThreadLocalThread;
-import io.netty5.util.internal.ObjectCleaner;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+package io.netty5.util.concurrent;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,6 +23,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.netty5.util.internal.ObjectCleaner;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
public class FastThreadLocalTest {
@BeforeEach
public void setUp() {
diff --git a/common/src/test/java/io/netty/util/concurrent/FutureCompletionStageTest.java b/common/src/test/java/io/netty5/util/concurrent/FutureCompletionStageTest.java
similarity index 93%
rename from common/src/test/java/io/netty/util/concurrent/FutureCompletionStageTest.java
rename to common/src/test/java/io/netty5/util/concurrent/FutureCompletionStageTest.java
index 799f0976be..b1e3a86f93 100644
--- a/common/src/test/java/io/netty/util/concurrent/FutureCompletionStageTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/FutureCompletionStageTest.java
@@ -13,19 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.FutureCompletionStage;
-import io.netty5.util.concurrent.ImmediateEventExecutor;
-import io.netty5.util.concurrent.MultithreadEventExecutorGroup;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
+package io.netty5.util.concurrent;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import org.junit.jupiter.api.Test;
+
public class FutureCompletionStageTest {
@Test
diff --git a/common/src/test/java/io/netty/util/concurrent/FuturesTest.java b/common/src/test/java/io/netty5/util/concurrent/FuturesTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/concurrent/FuturesTest.java
rename to common/src/test/java/io/netty5/util/concurrent/FuturesTest.java
index 8dbb2b1363..c13850335a 100644
--- a/common/src/test/java/io/netty/util/concurrent/FuturesTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/FuturesTest.java
@@ -13,14 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.DefaultPromise;
-import io.netty5.util.concurrent.Future;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
+package io.netty5.util.concurrent;
import static io.netty5.util.concurrent.ImmediateEventExecutor.INSTANCE;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -30,6 +23,10 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.Test;
+
class FuturesTest {
@Test
public void mapMustApplyMapperFunctionWhenFutureSucceeds() {
diff --git a/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java b/common/src/test/java/io/netty5/util/concurrent/GlobalEventExecutorTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java
rename to common/src/test/java/io/netty5/util/concurrent/GlobalEventExecutorTest.java
index bf7103becf..b289381965 100644
--- a/common/src/test/java/io/netty/util/concurrent/GlobalEventExecutorTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/GlobalEventExecutorTest.java
@@ -14,17 +14,7 @@
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.GlobalEventExecutor;
-import io.netty5.util.concurrent.ScheduledFuture;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+package io.netty5.util.concurrent;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -33,6 +23,13 @@ import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
public class GlobalEventExecutorTest {
private static final GlobalEventExecutor e = GlobalEventExecutor.INSTANCE;
diff --git a/common/src/test/java/io/netty/util/concurrent/ImmediateExecutorTest.java b/common/src/test/java/io/netty5/util/concurrent/ImmediateExecutorTest.java
similarity index 94%
rename from common/src/test/java/io/netty/util/concurrent/ImmediateExecutorTest.java
rename to common/src/test/java/io/netty5/util/concurrent/ImmediateExecutorTest.java
index 815e331460..8608a8cb2a 100644
--- a/common/src/test/java/io/netty/util/concurrent/ImmediateExecutorTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/ImmediateExecutorTest.java
@@ -14,16 +14,14 @@
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import io.netty5.util.concurrent.ImmediateExecutor;
import java.util.concurrent.FutureTask;
-
import org.junit.jupiter.api.Test;
public class ImmediateExecutorTest {
diff --git a/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java b/common/src/test/java/io/netty5/util/concurrent/NonStickyEventExecutorGroupTest.java
similarity index 93%
rename from common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java
rename to common/src/test/java/io/netty5/util/concurrent/NonStickyEventExecutorGroupTest.java
index c4021362e7..ee746c023e 100644
--- a/common/src/test/java/io/netty/util/concurrent/NonStickyEventExecutorGroupTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/NonStickyEventExecutorGroupTest.java
@@ -13,21 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.netty5.util.NettyRuntime;
-import io.netty5.util.concurrent.DefaultEventExecutorGroup;
-import io.netty5.util.concurrent.EventExecutor;
-import io.netty5.util.concurrent.EventExecutorGroup;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.NonStickyEventExecutorGroup;
-import io.netty5.util.concurrent.OrderedEventExecutor;
-import io.netty5.util.concurrent.UnorderedThreadPoolEventExecutor;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -35,9 +26,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
public class NonStickyEventExecutorGroupTest {
private static final String PARAMETERIZED_NAME = "{index}: maxTaskExecutePerRun = {0}";
diff --git a/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java b/common/src/test/java/io/netty5/util/concurrent/PromiseCombinerTest.java
similarity index 94%
rename from common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java
rename to common/src/test/java/io/netty5/util/concurrent/PromiseCombinerTest.java
index dcfefa771c..599c01bf44 100644
--- a/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/PromiseCombinerTest.java
@@ -13,15 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.EventExecutor;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.Promise;
-import io.netty5.util.concurrent.PromiseCombiner;
-import io.netty5.util.concurrent.SingleThreadEventExecutor;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.concurrent;
import static io.netty5.util.concurrent.ImmediateEventExecutor.INSTANCE;
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,6 +22,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class PromiseCombinerTest {
private Promise p1;
private Future f1;
diff --git a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java b/common/src/test/java/io/netty5/util/concurrent/SingleThreadEventExecutorTest.java
similarity index 96%
rename from common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java
rename to common/src/test/java/io/netty5/util/concurrent/SingleThreadEventExecutorTest.java
index 27722061f8..865904f562 100644
--- a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/SingleThreadEventExecutorTest.java
@@ -13,16 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
-import io.netty5.util.concurrent.DefaultThreadFactory;
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.Promise;
-import io.netty5.util.concurrent.RejectedExecutionHandlers;
-import io.netty5.util.concurrent.ScheduledFuture;
-import io.netty5.util.concurrent.SingleThreadEventExecutor;
-import io.netty5.util.concurrent.ThreadProperties;
-import org.junit.jupiter.api.Test;
+import static java.time.Duration.ofSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collections;
import java.util.Queue;
@@ -38,13 +36,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-
-import static java.time.Duration.ofSeconds;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
public class SingleThreadEventExecutorTest {
public static final Runnable DUMMY_TASK = () -> {
diff --git a/common/src/test/java/io/netty/util/concurrent/TestEventExecutor.java b/common/src/test/java/io/netty5/util/concurrent/TestEventExecutor.java
similarity index 89%
rename from common/src/test/java/io/netty/util/concurrent/TestEventExecutor.java
rename to common/src/test/java/io/netty5/util/concurrent/TestEventExecutor.java
index dd8f93dc24..b3510512da 100644
--- a/common/src/test/java/io/netty/util/concurrent/TestEventExecutor.java
+++ b/common/src/test/java/io/netty5/util/concurrent/TestEventExecutor.java
@@ -13,9 +13,8 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
+package io.netty5.util.concurrent;
-import io.netty5.util.concurrent.SingleThreadEventExecutor;
import java.util.concurrent.Executors;
final class TestEventExecutor extends SingleThreadEventExecutor {
diff --git a/common/src/test/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutorTest.java b/common/src/test/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutorTest.java
similarity index 95%
rename from common/src/test/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutorTest.java
rename to common/src/test/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutorTest.java
index e3569f9d76..f9fc1523e7 100644
--- a/common/src/test/java/io/netty/util/concurrent/UnorderedThreadPoolEventExecutorTest.java
+++ b/common/src/test/java/io/netty5/util/concurrent/UnorderedThreadPoolEventExecutorTest.java
@@ -13,22 +13,18 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.concurrent;
-
-import io.netty5.util.concurrent.Future;
-import io.netty5.util.concurrent.FutureListener;
-import io.netty5.util.concurrent.UnorderedThreadPoolEventExecutor;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+package io.netty5.util.concurrent;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
public class UnorderedThreadPoolEventExecutorTest {
// See https://github.com/netty/netty/issues/6507
diff --git a/common/src/test/java/io/netty/util/internal/AppendableCharSequenceTest.java b/common/src/test/java/io/netty5/util/internal/AppendableCharSequenceTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/AppendableCharSequenceTest.java
rename to common/src/test/java/io/netty5/util/internal/AppendableCharSequenceTest.java
index af4516c631..2fb57e9c08 100644
--- a/common/src/test/java/io/netty/util/internal/AppendableCharSequenceTest.java
+++ b/common/src/test/java/io/netty5/util/internal/AppendableCharSequenceTest.java
@@ -13,13 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.AppendableCharSequence;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class AppendableCharSequenceTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java b/common/src/test/java/io/netty5/util/internal/DefaultPriorityQueueTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java
rename to common/src/test/java/io/netty5/util/internal/DefaultPriorityQueueTest.java
index 8a11461f06..d4e901eff8 100644
--- a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java
+++ b/common/src/test/java/io/netty5/util/internal/DefaultPriorityQueueTest.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
-import io.netty5.util.internal.DefaultPriorityQueue;
-import io.netty5.util.internal.PriorityQueue;
-import io.netty5.util.internal.PriorityQueueNode;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.Serializable;
import java.util.ArrayList;
@@ -27,13 +29,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class DefaultPriorityQueueTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/LongLongHashMapTest.java b/common/src/test/java/io/netty5/util/internal/LongLongHashMapTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/LongLongHashMapTest.java
rename to common/src/test/java/io/netty5/util/internal/LongLongHashMapTest.java
index 8097475b02..0901ec5e1e 100644
--- a/common/src/test/java/io/netty/util/internal/LongLongHashMapTest.java
+++ b/common/src/test/java/io/netty5/util/internal/LongLongHashMapTest.java
@@ -13,10 +13,9 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
-import io.netty5.util.internal.LongLongHashMap;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.HashSet;
@@ -24,8 +23,7 @@ import java.util.Map;
import java.util.PrimitiveIterator.OfLong;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
class LongLongHashMapTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/LongPriorityQueueTest.java b/common/src/test/java/io/netty5/util/internal/LongPriorityQueueTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/LongPriorityQueueTest.java
rename to common/src/test/java/io/netty5/util/internal/LongPriorityQueueTest.java
index a27c860664..1965025872 100644
--- a/common/src/test/java/io/netty/util/internal/LongPriorityQueueTest.java
+++ b/common/src/test/java/io/netty5/util/internal/LongPriorityQueueTest.java
@@ -13,19 +13,17 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
-import io.netty5.util.internal.LongPriorityQueue;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.ListIterator;
import java.util.concurrent.ThreadLocalRandom;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
class LongPriorityQueueTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/MacAddressUtilTest.java b/common/src/test/java/io/netty5/util/internal/MacAddressUtilTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/MacAddressUtilTest.java
rename to common/src/test/java/io/netty5/util/internal/MacAddressUtilTest.java
index c5ef50659c..17e4c048b7 100644
--- a/common/src/test/java/io/netty/util/internal/MacAddressUtilTest.java
+++ b/common/src/test/java/io/netty5/util/internal/MacAddressUtilTest.java
@@ -13,10 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.MacAddressUtil;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal;
import static io.netty5.util.internal.EmptyArrays.EMPTY_BYTES;
import static io.netty5.util.internal.MacAddressUtil.parseMAC;
@@ -24,6 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class MacAddressUtilTest {
@Test
public void testCompareAddresses() {
diff --git a/common/src/test/java/io/netty/util/internal/MathUtilTest.java b/common/src/test/java/io/netty5/util/internal/MathUtilTest.java
similarity index 93%
rename from common/src/test/java/io/netty/util/internal/MathUtilTest.java
rename to common/src/test/java/io/netty5/util/internal/MathUtilTest.java
index 563e527582..d3a6ef1d7a 100644
--- a/common/src/test/java/io/netty/util/internal/MathUtilTest.java
+++ b/common/src/test/java/io/netty5/util/internal/MathUtilTest.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
+import static io.netty5.util.internal.MathUtil.findNextPositivePowerOfTwo;
+import static io.netty5.util.internal.MathUtil.isOutOfBounds;
+import static io.netty5.util.internal.MathUtil.safeFindNextPositivePowerOfTwo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static io.netty5.util.internal.MathUtil.*;
import org.junit.jupiter.api.Test;
diff --git a/common/src/test/java/io/netty/util/internal/NativeLibraryLoaderTest.java b/common/src/test/java/io/netty5/util/internal/NativeLibraryLoaderTest.java
similarity index 91%
rename from common/src/test/java/io/netty/util/internal/NativeLibraryLoaderTest.java
rename to common/src/test/java/io/netty5/util/internal/NativeLibraryLoaderTest.java
index 404ee668b1..c94c8841e3 100644
--- a/common/src/test/java/io/netty/util/internal/NativeLibraryLoaderTest.java
+++ b/common/src/test/java/io/netty5/util/internal/NativeLibraryLoaderTest.java
@@ -13,13 +13,14 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import io.netty5.util.CharsetUtil;
-import io.netty5.util.internal.NativeLibraryLoader;
-import io.netty5.util.internal.SuppressJava6Requirement;
-import org.junit.jupiter.api.Test;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
@@ -28,11 +29,7 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
public class NativeLibraryLoaderTest {
@@ -42,8 +39,11 @@ public class NativeLibraryLoaderTest {
NativeLibraryLoader.load(UUID.randomUUID().toString(), NativeLibraryLoaderTest.class.getClassLoader());
fail();
} catch (UnsatisfiedLinkError error) {
- assertTrue(error.getCause() instanceof FileNotFoundException);
- verifySuppressedException(error, UnsatisfiedLinkError.class);
+ assertTrue(error.getCause() instanceof FileNotFoundException
+ || error.getCause() == null);
+ if (error.getCause() != null) {
+ verifySuppressedException(error, UnsatisfiedLinkError.class);
+ }
}
}
@@ -53,8 +53,11 @@ public class NativeLibraryLoaderTest {
NativeLibraryLoader.load(UUID.randomUUID().toString(), null);
fail();
} catch (UnsatisfiedLinkError error) {
- assertTrue(error.getCause() instanceof FileNotFoundException);
- verifySuppressedException(error, ClassNotFoundException.class);
+ assertTrue(error.getCause() instanceof FileNotFoundException
+ || error.getCause() == null);
+ if (error.getCause() != null) {
+ verifySuppressedException(error, ClassNotFoundException.class);
+ }
}
}
diff --git a/common/src/test/java/io/netty/util/internal/ObjectCleanerTest.java b/common/src/test/java/io/netty5/util/internal/ObjectCleanerTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/ObjectCleanerTest.java
rename to common/src/test/java/io/netty5/util/internal/ObjectCleanerTest.java
index 06ed2fe71c..089fe0d7f9 100644
--- a/common/src/test/java/io/netty/util/internal/ObjectCleanerTest.java
+++ b/common/src/test/java/io/netty5/util/internal/ObjectCleanerTest.java
@@ -13,22 +13,20 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.ObjectCleaner;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
public class ObjectCleanerTest {
private Thread temporaryThread;
diff --git a/common/src/test/java/io/netty/util/internal/ObjectUtilTest.java b/common/src/test/java/io/netty5/util/internal/ObjectUtilTest.java
similarity index 99%
rename from common/src/test/java/io/netty/util/internal/ObjectUtilTest.java
rename to common/src/test/java/io/netty5/util/internal/ObjectUtilTest.java
index 7a48ce2929..d5954d83ac 100644
--- a/common/src/test/java/io/netty/util/internal/ObjectUtilTest.java
+++ b/common/src/test/java/io/netty5/util/internal/ObjectUtilTest.java
@@ -12,17 +12,16 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.ObjectUtil;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
/**
- * Testcases for io.netty.util.internal.ObjectUtil.
+ * Testcases for io.netty5.util.internal.ObjectUtil.
*
* The tests for exceptions do not use a fail mimic. The tests evaluate the
* presence and type, to have really regression character.
diff --git a/common/src/test/java/io/netty/util/internal/PlatformDependent0Test.java b/common/src/test/java/io/netty5/util/internal/PlatformDependent0Test.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/PlatformDependent0Test.java
rename to common/src/test/java/io/netty5/util/internal/PlatformDependent0Test.java
index 7b6cd36f62..5aaff93281 100644
--- a/common/src/test/java/io/netty/util/internal/PlatformDependent0Test.java
+++ b/common/src/test/java/io/netty5/util/internal/PlatformDependent0Test.java
@@ -13,18 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.PlatformDependent0;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
-import java.security.Permission;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.nio.ByteBuffer;
+import java.security.Permission;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
public class PlatformDependent0Test {
@BeforeAll
diff --git a/common/src/test/java/io/netty/util/internal/PlatformDependentTest.java b/common/src/test/java/io/netty5/util/internal/PlatformDependentTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/PlatformDependentTest.java
rename to common/src/test/java/io/netty5/util/internal/PlatformDependentTest.java
index f82e306b45..0c9ef2df79 100644
--- a/common/src/test/java/io/netty/util/internal/PlatformDependentTest.java
+++ b/common/src/test/java/io/netty5/util/internal/PlatformDependentTest.java
@@ -13,13 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.PlatformDependent;
-import org.junit.jupiter.api.Test;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
+package io.netty5.util.internal;
import static io.netty5.util.internal.PlatformDependent.hashCodeAscii;
import static io.netty5.util.internal.PlatformDependent.hashCodeAsciiSafe;
@@ -30,6 +24,10 @@ import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import java.nio.ByteBuffer;
+import java.util.Random;
+import org.junit.jupiter.api.Test;
+
public class PlatformDependentTest {
private static final Random r = new Random();
@Test
diff --git a/common/src/test/java/io/netty/util/internal/StringUtilTest.java b/common/src/test/java/io/netty5/util/internal/StringUtilTest.java
similarity index 99%
rename from common/src/test/java/io/netty/util/internal/StringUtilTest.java
rename to common/src/test/java/io/netty5/util/internal/StringUtilTest.java
index 64066cdd95..7cb815408e 100644
--- a/common/src/test/java/io/netty/util/internal/StringUtilTest.java
+++ b/common/src/test/java/io/netty5/util/internal/StringUtilTest.java
@@ -13,19 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.EmptyArrays;
-import io.netty5.util.internal.StringUtil;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
+package io.netty5.util.internal;
import static io.netty5.util.internal.StringUtil.NEWLINE;
import static io.netty5.util.internal.StringUtil.commonSuffixOfLength;
-import static io.netty5.util.internal.StringUtil.indexOfWhiteSpace;
import static io.netty5.util.internal.StringUtil.indexOfNonWhiteSpace;
+import static io.netty5.util.internal.StringUtil.indexOfWhiteSpace;
import static io.netty5.util.internal.StringUtil.isNullOrEmpty;
import static io.netty5.util.internal.StringUtil.simpleClassName;
import static io.netty5.util.internal.StringUtil.substringAfter;
@@ -43,6 +36,10 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
public class StringUtilTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/SystemPropertyUtilTest.java b/common/src/test/java/io/netty5/util/internal/SystemPropertyUtilTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/SystemPropertyUtilTest.java
rename to common/src/test/java/io/netty5/util/internal/SystemPropertyUtilTest.java
index 67839e0173..8a2c6dae7a 100644
--- a/common/src/test/java/io/netty/util/internal/SystemPropertyUtilTest.java
+++ b/common/src/test/java/io/netty5/util/internal/SystemPropertyUtilTest.java
@@ -13,17 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.SystemPropertyUtil;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class SystemPropertyUtilTest {
@BeforeEach
diff --git a/common/src/test/java/io/netty/util/internal/ThreadExecutorMapTest.java b/common/src/test/java/io/netty5/util/internal/ThreadExecutorMapTest.java
similarity index 95%
rename from common/src/test/java/io/netty/util/internal/ThreadExecutorMapTest.java
rename to common/src/test/java/io/netty5/util/internal/ThreadExecutorMapTest.java
index 7cf0235628..1ac8a92280 100644
--- a/common/src/test/java/io/netty/util/internal/ThreadExecutorMapTest.java
+++ b/common/src/test/java/io/netty5/util/internal/ThreadExecutorMapTest.java
@@ -13,18 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
+package io.netty5.util.internal;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
import io.netty5.util.concurrent.ImmediateEventExecutor;
import io.netty5.util.concurrent.ImmediateExecutor;
-import io.netty5.util.internal.ThreadExecutorMap;
-import org.junit.jupiter.api.Test;
-
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
-
-import static org.junit.jupiter.api.Assertions.assertSame;
+import org.junit.jupiter.api.Test;
public class ThreadExecutorMapTest {
diff --git a/common/src/test/java/io/netty/util/internal/ThreadLocalRandomTest.java b/common/src/test/java/io/netty5/util/internal/ThreadLocalRandomTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/ThreadLocalRandomTest.java
rename to common/src/test/java/io/netty5/util/internal/ThreadLocalRandomTest.java
index 0cc44ac8d6..c14ae35e15 100644
--- a/common/src/test/java/io/netty/util/internal/ThreadLocalRandomTest.java
+++ b/common/src/test/java/io/netty5/util/internal/ThreadLocalRandomTest.java
@@ -13,12 +13,12 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal;
-
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class ThreadLocalRandomTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/TypeParameterMatcherTest.java b/common/src/test/java/io/netty5/util/internal/TypeParameterMatcherTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/TypeParameterMatcherTest.java
rename to common/src/test/java/io/netty5/util/internal/TypeParameterMatcherTest.java
index 097def98a6..aa4a98ddda 100644
--- a/common/src/test/java/io/netty/util/internal/TypeParameterMatcherTest.java
+++ b/common/src/test/java/io/netty5/util/internal/TypeParameterMatcherTest.java
@@ -14,17 +14,15 @@
* under the License.
*/
-package io.netty.util.internal;
-
-import io.netty5.util.internal.TypeParameterMatcher;
-import org.junit.jupiter.api.Test;
-
-import java.util.Date;
+package io.netty5.util.internal;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Date;
+import org.junit.jupiter.api.Test;
+
public class TypeParameterMatcherTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java b/common/src/test/java/io/netty5/util/internal/logging/AbstractInternalLoggerTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/AbstractInternalLoggerTest.java
index 5a7278204b..0e531244bf 100644
--- a/common/src/test/java/io/netty/util/internal/logging/AbstractInternalLoggerTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/AbstractInternalLoggerTest.java
@@ -13,18 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import io.netty5.util.internal.logging.InternalLogLevel;
-import io.netty5.util.internal.logging.InternalLogger;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-
import org.junit.jupiter.api.Test;
/**
diff --git a/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerFactoryTest.java
similarity index 83%
rename from common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerFactoryTest.java
index 8ef1fd35c2..531948940e 100644
--- a/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerFactoryTest.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.CommonsLogger;
-import io.netty5.util.internal.logging.CommonsLoggerFactory;
-import io.netty5.util.internal.logging.InternalLogger;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class CommonsLoggerFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java b/common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerTest.java
similarity index 96%
rename from common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerTest.java
index 8c28b41b36..f76ba9a64b 100644
--- a/common/src/test/java/io/netty/util/internal/logging/CommonsLoggerTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/CommonsLoggerTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.CommonsLogger;
-import io.netty5.util.internal.logging.InternalLogger;
-import org.apache.commons.logging.Log;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.commons.logging.Log;
+import org.junit.jupiter.api.Test;
public class CommonsLoggerTest {
private static final Exception e = new Exception();
diff --git a/common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/InternalLoggerFactoryTest.java
similarity index 96%
rename from common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/InternalLoggerFactoryTest.java
index 128e51e7fb..8c1a8c336e 100644
--- a/common/src/test/java/io/netty/util/internal/logging/InternalLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/InternalLoggerFactoryTest.java
@@ -13,19 +13,20 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.InternalLoggerFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InternalLoggerFactoryTest {
private static final Exception e = new Exception();
diff --git a/common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/JdkLoggerFactoryTest.java
similarity index 83%
rename from common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/JdkLoggerFactoryTest.java
index dc4c72d84a..fc8d2e7bc7 100644
--- a/common/src/test/java/io/netty/util/internal/logging/JdkLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/JdkLoggerFactoryTest.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.JdkLogger;
-import io.netty5.util.internal.logging.JdkLoggerFactory;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class JdkLoggerFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerFactoryTest.java
similarity index 83%
rename from common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerFactoryTest.java
index ecf1bf5e2c..f2213bbf95 100644
--- a/common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerFactoryTest.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.Log4J2Logger;
-import io.netty5.util.internal.logging.Log4J2LoggerFactory;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class Log4J2LoggerFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerTest.java b/common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerTest.java
similarity index 93%
rename from common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerTest.java
index a5fa82dd08..9d3f9b171e 100644
--- a/common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/Log4J2LoggerTest.java
@@ -13,24 +13,19 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import io.netty5.util.internal.logging.InternalLogLevel;
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.Log4J2Logger;
+import io.netty5.util.internal.ReflectionUtil;
import java.lang.reflect.Method;
import java.util.Arrays;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
-
-import io.netty5.util.internal.ReflectionUtil;
import org.junit.jupiter.api.Assumptions;
/**
diff --git a/common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/Log4JLoggerFactoryTest.java
similarity index 83%
rename from common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/Log4JLoggerFactoryTest.java
index e135b626d2..634b450fa9 100644
--- a/common/src/test/java/io/netty/util/internal/logging/Log4JLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/Log4JLoggerFactoryTest.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.Log4JLogger;
-import io.netty5.util.internal.logging.Log4JLoggerFactory;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
public class Log4JLoggerFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/MessageFormatterTest.java b/common/src/test/java/io/netty5/util/internal/logging/MessageFormatterTest.java
similarity index 98%
rename from common/src/test/java/io/netty/util/internal/logging/MessageFormatterTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/MessageFormatterTest.java
index 5b62cb9ee6..5fb12537f7 100644
--- a/common/src/test/java/io/netty/util/internal/logging/MessageFormatterTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/MessageFormatterTest.java
@@ -36,15 +36,13 @@
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.FormattingTuple;
-import io.netty5.util.internal.logging.MessageFormatter;
-import org.junit.jupiter.api.Test;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
+
public class MessageFormatterTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerFactoryTest.java
similarity index 94%
rename from common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerFactoryTest.java
index 9ff1aca9b3..d016e4c01d 100644
--- a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerFactoryTest.java
@@ -13,25 +13,25 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
+package io.netty5.util.internal.logging;
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.LocationAwareSlf4JLogger;
-import io.netty5.util.internal.logging.Slf4JLogger;
-import io.netty5.util.internal.logging.Slf4JLoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Iterator;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.slf4j.Logger;
import org.slf4j.spi.LocationAwareLogger;
-import java.util.Iterator;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
-
public class Slf4JLoggerFactoryTest {
@Test
diff --git a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerTest.java
similarity index 97%
rename from common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java
rename to common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerTest.java
index 0216d7aa31..8be3dc43df 100644
--- a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerTest.java
+++ b/common/src/test/java/io/netty5/util/internal/logging/Slf4JLoggerTest.java
@@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package io.netty.util.internal.logging;
-
-import io.netty5.util.internal.logging.InternalLogger;
-import io.netty5.util.internal.logging.Slf4JLogger;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
+package io.netty5.util.internal.logging;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
public class Slf4JLoggerTest {
private static final Exception e = new Exception();
diff --git a/common/src/test/templates/io/netty/util/collection/KObjectHashMapTest.template b/common/src/test/templates/io/netty5/util/collection/KObjectHashMapTest.template
similarity index 99%
rename from common/src/test/templates/io/netty/util/collection/KObjectHashMapTest.template
rename to common/src/test/templates/io/netty5/util/collection/KObjectHashMapTest.template
index cd2f254430..717a9e1a3a 100644
--- a/common/src/test/templates/io/netty/util/collection/KObjectHashMapTest.template
+++ b/common/src/test/templates/io/netty5/util/collection/KObjectHashMapTest.template
@@ -12,9 +12,9 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package io.netty.util.collection;
+package io.netty5.util.collection;
-import io.netty.util.collection.@K@ObjectMap.PrimitiveEntry;
+import io.netty5.util.collection.@K@ObjectMap.PrimitiveEntry;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml
index 92fbccb96a..c3f467ac6d 100644
--- a/dev-tools/pom.xml
+++ b/dev-tools/pom.xml
@@ -16,14 +16,15 @@
-->
4.0.0
-
- org.sonatype.oss
- oss-parent
- 7
-
+
+
+ mchv-snapshot
+ MCHV Apache Snapshot Maven Packages Distribution
+ https://mvn.mchv.eu/repository/mchv-snapshot
+
+
- io.netty
+ io.netty5
netty-dev-tools
5.0.0.Final-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 8fec43fc60..0a53545b7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
9
- io.netty
+ io.netty5
netty-parent
pom
5.0.0.Final-SNAPSHOT
@@ -445,7 +445,7 @@
${project.build.directory}/dev-tools
UTF-8
UTF-8
- 29
+ 30-SNAPSHOT
1.4.11.Final
2.0.10
"${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar
@@ -507,7 +507,7 @@
- io.netty
+ io.netty5
netty-jni-util
0.0.3.Final
sources
@@ -751,9 +751,9 @@
test
- ${project.groupId}
+ io.netty5
netty-build-common
- ${netty.build.version}
+ 30-SNAPSHOT
test
@@ -893,7 +893,7 @@
test
- ${project.groupId}
+ io.netty5
netty-build-common
test
@@ -1032,7 +1032,7 @@
true
true
true
- io/netty/checkstyle.xml
+ io/netty5/checkstyle.xml
${project.build.sourceDirectory}
${project.build.testSourceDirectory}
@@ -1065,7 +1065,7 @@
8.29
- ${project.groupId}
+ io.netty5
netty-build-common
${netty.build.version}
diff --git a/run-example.sh b/run-example.sh
index dd078f2f4a..daeacf723c 100755
--- a/run-example.sh
+++ b/run-example.sh
@@ -15,41 +15,41 @@
# under the License.
# ----------------------------------------------------------------------------
EXAMPLE_MAP=(
- 'discard-client:io.netty.example.discard.DiscardClient'
- 'discard-server:io.netty.example.discard.DiscardServer'
- 'echo-client:io.netty.example.echo.EchoClient'
- 'echo-server:io.netty.example.echo.EchoServer'
- 'factorial-client:io.netty.example.factorial.FactorialClient'
- 'factorial-server:io.netty.example.factorial.FactorialServer'
- 'file-server:io.netty.example.file.FileServer'
- 'http-cors-server:io.netty.example.http.cors.HttpCorsServer'
- 'http-file-server:io.netty.example.http.file.HttpStaticFileServer'
- 'http-helloworld-server:io.netty.example.http.helloworld.HttpHelloWorldServer'
- 'http-snoop-client:io.netty.example.http.snoop.HttpSnoopClient'
- 'http-snoop-server:io.netty.example.http.snoop.HttpSnoopServer'
- 'http-upload-client:io.netty.example.http.upload.HttpUploadClient'
- 'http-upload-server:io.netty.example.http.upload.HttpUploadServer'
- 'websocket-client:io.netty.example.http.websocketx.client.WebSocketClient'
- 'websocket-server:io.netty.example.http.websocketx.server.WebSocketServer'
- 'http2-client:io.netty.example.http2.helloworld.client.Http2Client'
- 'http2-server:io.netty.example.http2.helloworld.server.Http2Server'
- 'http2-tiles:io.netty.example.http2.tiles.Launcher'
- 'http2-multiplex-server:io.netty.example.http2.helloworld.multiplex.server.Http2Server'
- 'worldclock-client:io.netty.example.worldclock.WorldClockClient'
- 'worldclock-server:io.netty.example.worldclock.WorldClockServer'
- 'objectecho-client:io.netty.example.objectecho.ObjectEchoClient'
- 'objectecho-server:io.netty.example.objectecho.ObjectEchoServer'
+ 'discard-client:io.netty5.example.discard.DiscardClient'
+ 'discard-server:io.netty5.example.discard.DiscardServer'
+ 'echo-client:io.netty5.example.echo.EchoClient'
+ 'echo-server:io.netty5.example.echo.EchoServer'
+ 'factorial-client:io.netty5.example.factorial.FactorialClient'
+ 'factorial-server:io.netty5.example.factorial.FactorialServer'
+ 'file-server:io.netty5.example.file.FileServer'
+ 'http-cors-server:io.netty5.example.http.cors.HttpCorsServer'
+ 'http-file-server:io.netty5.example.http.file.HttpStaticFileServer'
+ 'http-helloworld-server:io.netty5.example.http.helloworld.HttpHelloWorldServer'
+ 'http-snoop-client:io.netty5.example.http.snoop.HttpSnoopClient'
+ 'http-snoop-server:io.netty5.example.http.snoop.HttpSnoopServer'
+ 'http-upload-client:io.netty5.example.http.upload.HttpUploadClient'
+ 'http-upload-server:io.netty5.example.http.upload.HttpUploadServer'
+ 'websocket-client:io.netty5.example.http.websocketx.client.WebSocketClient'
+ 'websocket-server:io.netty5.example.http.websocketx.server.WebSocketServer'
+ 'http2-client:io.netty5.example.http2.helloworld.client.Http2Client'
+ 'http2-server:io.netty5.example.http2.helloworld.server.Http2Server'
+ 'http2-tiles:io.netty5.example.http2.tiles.Launcher'
+ 'http2-multiplex-server:io.netty5.example.http2.helloworld.multiplex.server.Http2Server'
+ 'worldclock-client:io.netty5.example.worldclock.WorldClockClient'
+ 'worldclock-server:io.netty5.example.worldclock.WorldClockServer'
+ 'objectecho-client:io.netty5.example.objectecho.ObjectEchoClient'
+ 'objectecho-server:io.netty5.example.objectecho.ObjectEchoServer'
'quote-client:org.jboss.netty.example.qotm.QuoteOfTheMomentClient'
'quote-server:org.jboss.netty.example.qotm.QuoteOfTheMomentServer'
- 'redis-client:io.netty.example.redis.RedisClient'
- 'securechat-client:io.netty.example.securechat.SecureChatClient'
- 'securechat-server:io.netty.example.securechat.SecureChatServer'
- 'telnet-client:io.netty.example.telnet.TelnetClient'
- 'telnet-server:io.netty.example.telnet.TelnetServer'
- 'proxy-server:io.netty.example.proxy.HexDumpProxy'
- 'socksproxy-server:io.netty.example.socksproxy.SocksServer'
- 'memcache-binary-client:io.netty.example.memcache.binary.MemcacheClient'
- 'stomp-client:io.netty.example.stomp.StompClient'
+ 'redis-client:io.netty5.example.redis.RedisClient'
+ 'securechat-client:io.netty5.example.securechat.SecureChatClient'
+ 'securechat-server:io.netty5.example.securechat.SecureChatServer'
+ 'telnet-client:io.netty5.example.telnet.TelnetClient'
+ 'telnet-server:io.netty5.example.telnet.TelnetServer'
+ 'proxy-server:io.netty5.example.proxy.HexDumpProxy'
+ 'socksproxy-server:io.netty5.example.socksproxy.SocksServer'
+ 'memcache-binary-client:io.netty5.example.memcache.binary.MemcacheClient'
+ 'stomp-client:io.netty5.example.stomp.StompClient'
'uptime-client:io.netty.example.uptime.UptimeClient'
'uptime-server:io.netty.example.uptime.UptimeServer'
'sctpecho-client:io.netty.example.sctp.SctpEchoClient'