Update lucene and netty 5

pom.xml

@@ -13,7 +13,7 @@
 		<revision>0-SNAPSHOT</revision>
 		<dbengine.ci>false</dbengine.ci>
 		<micrometer.version>1.9.3</micrometer.version>
-		<lucene.version>9.3.0</lucene.version>
+		<lucene.version>9.4.0</lucene.version>
 		<junit.jupiter.version>5.9.0</junit.jupiter.version>
 	</properties>
 	<repositories>
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty5-buffer</artifactId>
-      <version>5.0.0.Alpha4</version>
+      <version>5.0.0.Alpha5</version>
       <exclusions>
         <exclusion>
           <groupId>io.netty</groupId>

src/main/java/it/cavallium/dbengine/MetricUtils.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine;
 
-import io.netty5.buffer.api.pool.PoolArenaMetric;
+import io.netty5.buffer.pool.PoolArenaMetric;
-import io.netty5.buffer.api.pool.PooledBufferAllocator;
+import io.netty5.buffer.pool.PooledBufferAllocator;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -24,7 +24,7 @@ public class MetricUtils {
 		MethodHandle handle = null;
 		try {
 			// Find the class
-			var pooledBufferClass = Class.forName("io.netty5.buffer.api.pool.PooledBufferAllocatorMetric");
+			var pooledBufferClass = Class.forName("io.netty5.buffer.pool.PooledBufferAllocatorMetric");
 			// Find the handle of the method
 			handle = lookup.findVirtual(pooledBufferClass, "arenaMetrics", MethodType.methodType(List.class));
 		} catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException ex) {

src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.client;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.DatabaseProperties;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

src/main/java/it/cavallium/dbengine/client/MappedSerializer.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.client;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.database.serialization.Serializer;

src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.client;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength;

src/main/java/it/cavallium/dbengine/database/BufSupplier.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import java.util.function.Supplier;
 

src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.lucene.LuceneHacks;
 import it.cavallium.dbengine.lucene.LuceneRocksDBManager;
 import it.cavallium.dbengine.rpc.current.data.Column;

src/main/java/it/cavallium/dbengine/database/LLDelta.java

@@ -1,10 +1,10 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import java.util.StringJoiner;
 import org.apache.logging.log4j.LogManager;

src/main/java/it/cavallium/dbengine/database/LLDictionary.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.database.disk.BinarySerializationFunction;

src/main/java/it/cavallium/dbengine/database/LLEntry.java

@@ -1,11 +1,11 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import java.util.Objects;
 import java.util.StringJoiner;

src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java

@@ -3,7 +3,7 @@ package it.cavallium.dbengine.database;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.client.IBackuppable;
 import it.cavallium.dbengine.client.MemoryStats;
 import it.cavallium.dbengine.database.collections.DatabaseInt;

src/main/java/it/cavallium/dbengine/database/LLMultiDatabaseConnection.java

@@ -2,7 +2,7 @@ package it.cavallium.dbengine.database;
 
 import com.google.common.collect.Multimap;
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart;
 import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart.ConnectionPartLucene;
 import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart.ConnectionPartRocksDB;

src/main/java/it/cavallium/dbengine/database/LLRange.java

@@ -1,10 +1,10 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import java.util.StringJoiner;
 import org.apache.logging.log4j.LogManager;

src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.LuceneIndexImpl;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
 import it.cavallium.dbengine.lucene.LuceneCloseable;

src/main/java/it/cavallium/dbengine/database/LLSingleton.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.disk.BinarySerializationFunction;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;

src/main/java/it/cavallium/dbengine/database/LLUtils.java

@@ -1,21 +1,20 @@
 package it.cavallium.dbengine.database;
 
-import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP;
+import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP;
+import static io.netty5.buffer.internal.InternalBufferUtils.NO_OP_DROP;
 import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler;
 import static org.apache.commons.lang3.ArrayUtils.EMPTY_BYTE_ARRAY;
 
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
-import io.netty5.buffer.api.AllocatorControl;
+import io.netty5.buffer.AllocatorControl;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.BufferComponent;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.CompositeBuffer;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.Drop;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.WritableComponent;
-import io.netty5.buffer.api.internal.Statics;
 import io.netty5.util.IllegalReferenceCountException;
 import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;
@@ -534,7 +533,7 @@ public class LLUtils {
 		try {
 			assert directBuffer.readerOffset() == 0;
 			assert directBuffer.writerOffset() == 0;
-			var directBufferWriter = ((WritableComponent) directBuffer).writableBuffer();
+			var directBufferWriter = ((BufferComponent) directBuffer).writableBuffer();
 			assert directBufferWriter.position() == 0;
 			assert directBufferWriter.capacity() >= directBuffer.capacity();
 			assert directBufferWriter.isDirect();
@@ -552,7 +551,7 @@ public class LLUtils {
 				assert directBuffer.readerOffset() == 0;
 				directBuffer.ensureWritable(trueSize);
 				assert directBuffer.writerOffset() == 0;
-				directBufferWriter = ((WritableComponent) directBuffer).writableBuffer();
+				directBufferWriter = ((BufferComponent) directBuffer).writableBuffer();
 				assert directBufferWriter.position() == 0;
 				assert directBufferWriter.isDirect();
 				reader.applyAsInt(directBufferWriter.position(0));
@@ -783,16 +782,16 @@ public class LLUtils {
 
 	private static Drop<Buffer> drop() {
 		// We cannot reliably drop unsafe memory. We have to rely on the cleaner to do that.
-		return Statics.NO_OP_DROP;
+		return NO_OP_DROP;
 	}
 
 	public static boolean isReadOnlyDirect(Buffer inputBuffer) {
-		return inputBuffer.isDirect() && inputBuffer instanceof ReadableComponent;
+		return inputBuffer instanceof BufferComponent component && component.readableNativeAddress() != 0;
 	}
 
 	public static ByteBuffer getReadOnlyDirect(Buffer inputBuffer) {
 		assert isReadOnlyDirect(inputBuffer);
-		return ((ReadableComponent) inputBuffer).readableBuffer();
+		return ((BufferComponent) inputBuffer).readableBuffer();
 	}
 
 	public static Buffer fromByteArray(BufferAllocator alloc, byte[] array) {
@@ -967,7 +966,7 @@ public class LLUtils {
 		if (readableComponents == 0) {
 			return true;
 		} else if (readableComponents == 1) {
-			return key.forEachReadable(0, (index, component) -> component.readableBuffer().isDirect()) >= 0;
+			return key.isDirect();
 		} else {
 			return false;
 		}

src/main/java/it/cavallium/dbengine/database/OptionalBuf.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.BufSupplier;
 import it.cavallium.dbengine.database.LLDictionary;
 import it.cavallium.dbengine.database.serialization.Serializer;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java

@@ -2,9 +2,9 @@ package it.cavallium.dbengine.database.collections;
 
 import static java.util.Objects.requireNonNullElseGet;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;
 import it.cavallium.dbengine.database.Delta;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java

@@ -1,12 +1,12 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.DefaultBufferAllocators;
+import io.netty5.buffer.DefaultBufferAllocators;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Resource;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java

@@ -1,15 +1,15 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;
 import it.cavallium.dbengine.database.LLDictionary;
 import it.cavallium.dbengine.database.LLUtils;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.SubStageEntry;
 import it.cavallium.dbengine.database.UpdateMode;
 import it.cavallium.dbengine.database.serialization.Serializer;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapSingle.java

@@ -1,9 +1,9 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java

@@ -1,13 +1,13 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.Delta;
 import it.cavallium.dbengine.database.LLUtils;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.UpdateReturnMode;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;
 import it.cavallium.dbengine.utils.SimpleResource;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java

@@ -1,9 +1,9 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.client.Mapper;

src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleton.java

@@ -1,9 +1,9 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.Delta;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.LLDictionary;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;
 import it.cavallium.dbengine.database.LLDictionary;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.BufSupplier;

src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.serialization.Serializer;
 

src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.CompositeBuffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.serialization.SerializationException;

src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.collections;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.database.serialization.Serializer;

src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP;
+import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP;
 import static it.cavallium.dbengine.database.LLUtils.INITIAL_DIRECT_READ_BYTE_BUF_SIZE_BYTES;
 import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect;
 import static java.lang.Boolean.parseBoolean;
@@ -13,11 +13,10 @@ import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.DefaultBufferAllocators;
+import io.netty5.buffer.BufferComponent;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.DefaultBufferAllocators;
-import io.netty5.buffer.api.WritableComponent;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.RepeatedElementList;
@@ -256,7 +255,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 		requireNonNull(key);
 		AbstractSlice<?> slice;
 		if (allowNettyDirect && USE_DIRECT_BUFFER_BOUNDS && isReadOnlyDirect(key)) {
-			ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer();
+			ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer();
 			assert keyInternalByteBuffer.position() == 0;
 			slice = new DirectSlice(keyInternalByteBuffer, key.readableBytes());
 			assert slice.size() == key.readableBytes();
@@ -371,7 +370,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 					} else {
 						mustCloseKey = false;
 					}
-					keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+					keyNioBuffer = ((BufferComponent) key).readableBuffer();
 					assert keyNioBuffer.isDirect();
 					assert keyNioBuffer.limit() == key.readableBytes();
 				}
@@ -389,7 +388,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 						} else {
 							mustCloseValue = false;
 						}
-						valueNioBuffer = ((ReadableComponent) value).readableBuffer();
+						valueNioBuffer = ((BufferComponent) value).readableBuffer();
 						assert valueNioBuffer.isDirect();
 						assert valueNioBuffer.limit() == value.readableBytes();
 					}
@@ -434,7 +433,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 					} else {
 						mustCloseKey = false;
 					}
-					keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+					keyNioBuffer = ((BufferComponent) key).readableBuffer();
 					assert keyNioBuffer.isDirect();
 					assert keyNioBuffer.limit() == key.readableBytes();
 				}
@@ -508,7 +507,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 					} else {
 						mustCloseKey = false;
 					}
-					keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+					keyNioBuffer = ((BufferComponent) key).readableBuffer();
 					assert keyNioBuffer.isDirect();
 					assert keyNioBuffer.limit() == key.readableBytes();
 				}
@@ -549,7 +548,7 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
 					} else {
 						mustCloseKey = false;
 					}
-					keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+					keyNioBuffer = ((BufferComponent) key).readableBuffer();
 					assert keyNioBuffer.isDirect();
 					assert keyNioBuffer.limit() == key.readableBytes();
 				}

src/main/java/it/cavallium/dbengine/database/disk/BinarySerializationFunction.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java

@@ -3,9 +3,9 @@ package it.cavallium.dbengine.database.disk;
 import static it.cavallium.dbengine.database.LLUtils.isDirect;
 import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.BufferComponent;
 import io.netty5.util.Send;
 import io.netty5.util.internal.PlatformDependent;
 import it.cavallium.dbengine.database.LLUtils;
@@ -116,8 +116,8 @@ public class CappedWriteBatch extends WriteBatch {
 		if (USE_FAST_DIRECT_BUFFERS
 				&& (isReadOnlyDirect(key))
 				&& (isReadOnlyDirect(value))) {
-			ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+			ByteBuffer keyNioBuffer = ((BufferComponent) key).readableBuffer();
-			ByteBuffer valueNioBuffer = ((ReadableComponent) value).readableBuffer();
+			ByteBuffer valueNioBuffer = ((BufferComponent) value).readableBuffer();
 			buffersToRelease.add(value);
 			buffersToRelease.add(key);
 
@@ -162,7 +162,7 @@ public class CappedWriteBatch extends WriteBatch {
 	public synchronized void delete(ColumnFamilyHandle columnFamilyHandle, Send<Buffer> keyToReceive) throws RocksDBException {
 		var key = keyToReceive.receive();
 		if (USE_FAST_DIRECT_BUFFERS && isReadOnlyDirect(key)) {
-			ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+			ByteBuffer keyNioBuffer = ((BufferComponent) key).readableBuffer();
 			buffersToRelease.add(key);
 			delete(columnFamilyHandle, keyNioBuffer);
 		} else {

src/main/java/it/cavallium/dbengine/database/disk/HugePqEnv.java

@@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.disk.LLTempHugePqEnv.getColumnOptio
 
 import com.google.common.primitives.Ints;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.utils.SimpleResource;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

src/main/java/it/cavallium/dbengine/database/disk/KeyMayExistGetter.java

@@ -8,11 +8,10 @@ import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kExistsWithValue;
 import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kExistsWithoutValue;
 import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kNotExist;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.DefaultBufferAllocators;
+import io.netty5.buffer.BufferComponent;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.DefaultBufferAllocators;
-import io.netty5.buffer.api.WritableComponent;
 import it.cavallium.dbengine.database.LLUtils;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -75,7 +74,7 @@ public abstract class KeyMayExistGetter {
 			} else {
 				mustCloseKey = false;
 			}
-			keyNioBuffer = ((ReadableComponent) key).readableBuffer();
+			keyNioBuffer = ((BufferComponent) key).readableBuffer();
 			assert keyNioBuffer.isDirect();
 			assert keyNioBuffer.limit() == key.readableBytes();
 		}
@@ -86,14 +85,14 @@ public abstract class KeyMayExistGetter {
 			try {
 				assert resultBuffer.readerOffset() == 0;
 				assert resultBuffer.writerOffset() == 0;
-				var resultWritable = ((WritableComponent) resultBuffer).writableBuffer();
+				var resultWritable = ((BufferComponent) resultBuffer).writableBuffer();
 
 				var keyMayExist = keyMayExist(readOptions, keyNioBuffer.rewind(), resultWritable.clear());
 				if (STRICT_MAYEXIST_NO_VALUE && keyMayExist.exists != kExistsWithValue && keyMayExist.valueLength != 0) {
 					// Create a direct result buffer because RocksDB works only with direct buffers
 					try (var realResultBuffer = bufferAllocator.allocate(INITIAL_DIRECT_READ_BYTE_BUF_SIZE_BYTES)) {
 						var resultWritableF = resultWritable;
-						var realResultWritable = ((WritableComponent) realResultBuffer).writableBuffer();
+						var realResultWritable = ((BufferComponent) realResultBuffer).writableBuffer();
 						var realSize = get(readOptions, keyNioBuffer.rewind(), realResultWritable);
 						var hexFormat = HexFormat.ofDelimiter(" ");
 						LOG.error(
@@ -178,7 +177,7 @@ public abstract class KeyMayExistGetter {
 							return resultBuffer.writerOffset(resultWritable.limit());
 						} else {
 							resultBuffer.ensureWritable(size);
-							resultWritable = ((WritableComponent) resultBuffer).writableBuffer();
+							resultWritable = ((BufferComponent) resultBuffer).writableBuffer();
 							assert resultBuffer.readerOffset() == 0;
 							assert resultBuffer.writerOffset() == 0;
 

src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.DiscardingCloseable;
 import it.cavallium.dbengine.database.SafeCloseable;
 import it.cavallium.dbengine.utils.SimpleResource;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java

@@ -3,7 +3,7 @@ package it.cavallium.dbengine.database.disk;
 import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.LLDatabaseConnection;
 import it.cavallium.dbengine.database.LLLuceneIndex;
 import it.cavallium.dbengine.lucene.LuceneHacks;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP;
+import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP;
 import static it.cavallium.dbengine.database.LLUtils.ALLOW_STATIC_OPTIONS;
 import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static it.cavallium.dbengine.database.LLUtils.fromByteArray;
@@ -12,9 +12,9 @@ import static java.util.Objects.requireNonNull;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Timer;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.BufferComponent;
 import io.netty5.util.Resource;
 import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.database.ColumnUtils;
@@ -308,7 +308,7 @@ public class LLLocalDictionary implements LLDictionary {
 							try (var rocksIterator = db.newIterator(readOpts, range.getMinUnsafe(), range.getMaxUnsafe())) {
 								if (!LLLocalDictionary.PREFER_AUTO_SEEK_BOUND && range.hasMin()) {
 									if (nettyDirect && isReadOnlyDirect(range.getMinUnsafe())) {
-										var seekBuf = ((ReadableComponent) range.getMinUnsafe()).readableBuffer();
+										var seekBuf = ((BufferComponent) range.getMinUnsafe()).readableBuffer();
 										rocksIterator.seek(seekBuf);
 									} else {
 										var seekArray = LLUtils.toArray(range.getMinUnsafe());

src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLEntry;
 import it.cavallium.dbengine.database.LLRange;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLEntry;
 import it.cavallium.dbengine.database.LLRange;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLRange;
 import java.util.function.Supplier;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java

@@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
 import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java

@@ -4,11 +4,11 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
 import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import java.util.function.Supplier;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLRange;
 import java.util.function.Supplier;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP;
+import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP;
 import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static java.lang.Boolean.parseBoolean;
 import static java.util.Objects.requireNonNull;
@@ -9,7 +9,7 @@ import static org.rocksdb.ColumnFamilyOptionsInterface.DEFAULT_COMPACTION_MEMTAB
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Timer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.internal.PlatformDependent;
 import it.cavallium.data.generator.nativedata.NullableString;
 import it.cavallium.dbengine.client.Backuppable;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java

@@ -2,10 +2,10 @@ package it.cavallium.dbengine.database.disk;
 
 import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.utils.SimpleResource;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java

@@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
 import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import java.util.function.Supplier;

src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java

@@ -2,8 +2,8 @@ package it.cavallium.dbengine.database.disk;
 
 import static it.cavallium.dbengine.database.disk.UpdateAtomicResultMode.DELTA;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.LLSingleton;

src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java

@@ -4,9 +4,9 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.MemoryManager;
+import io.netty5.buffer.MemoryManager;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.LLUtils;

src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java

@@ -3,9 +3,9 @@ package it.cavallium.dbengine.database.disk;
 import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.MemoryManager;
+import io.netty5.buffer.MemoryManager;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.LLUtils;

src/main/java/it/cavallium/dbengine/database/disk/RocksDBColumn.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.disk;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.disk.rocksdb.RocksIteratorObj;

src/main/java/it/cavallium/dbengine/database/disk/StandardRocksDBColumn.java

@@ -3,8 +3,8 @@ package it.cavallium.dbengine.database.disk;
 import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.LLUtils;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 
 public record UpdateAtomicResultCurrent(Buffer current) implements UpdateAtomicResult {

src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.disk;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 
 public record UpdateAtomicResultPrevious(Buffer previous) implements UpdateAtomicResult {

src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLColumnFamilyHandle.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.disk.rocksdb;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import org.rocksdb.AbstractSlice;
 import org.rocksdb.ColumnFamilyHandle;

src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLCompactionOptions.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.disk.rocksdb;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import org.rocksdb.CompactionOptions;
 

src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLReadOptions.java

@@ -1,10 +1,10 @@
 package it.cavallium.dbengine.database.disk.rocksdb;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.SafeCloseable;
 import it.cavallium.dbengine.database.disk.LLLocalGroupedReactiveRocksIterator;

src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLWriteOptions.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.database.disk.rocksdb;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import org.rocksdb.WriteOptions;
 

src/main/java/it/cavallium/dbengine/database/disk/rocksdb/RocksIteratorObj.java

@@ -4,11 +4,11 @@ import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Timer;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.BufferComponent;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.Owned;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.utils.SimpleResource;
 import java.nio.ByteBuffer;
@@ -142,7 +142,7 @@ public class RocksIteratorObj extends SimpleResource {
 	public void seekFrom(Buffer key) {
 		ensureOpen();
 		if (allowNettyDirect && isReadOnlyDirect(key)) {
-			ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer();
+			ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer();
 			assert keyInternalByteBuffer.position() == 0;
 			rocksIterator.seekForPrev(keyInternalByteBuffer);
 			// This is useful to retain the key buffer in memory and avoid deallocations
@@ -161,7 +161,7 @@ public class RocksIteratorObj extends SimpleResource {
 	public void seekTo(Buffer key) {
 		ensureOpen();
 		if (allowNettyDirect && isReadOnlyDirect(key)) {
-			ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer();
+			ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer();
 			assert keyInternalByteBuffer.position() == 0;
 			startedIterSeek.increment();
 			iterSeekTime.record(() -> rocksIterator.seek(keyInternalByteBuffer));

src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java

@@ -3,7 +3,7 @@ package it.cavallium.dbengine.database.memory;
 import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.database.LLDatabaseConnection;
 import it.cavallium.dbengine.database.LLKeyValueDatabase;
 import it.cavallium.dbengine.database.LLLuceneIndex;

src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.memory;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Resource;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.BadBlock;

src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.memory;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.client.MemoryStats;
 import it.cavallium.dbengine.database.ColumnProperty;
 import it.cavallium.dbengine.database.LLDictionary;

src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.memory;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLDelta;
 import it.cavallium.dbengine.database.LLDictionaryResultType;

src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java

@@ -4,8 +4,8 @@ import com.google.common.collect.Multimap;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.incubator.codec.quic.QuicSslContextBuilder;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.client.MemoryStats;
 import it.cavallium.dbengine.client.query.current.data.Query;

src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.remote;
 
 import io.netty.handler.codec.ByteToMessageCodec;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.data.generator.nativedata.NullableString;
 import it.cavallium.dbengine.database.OptionalBuf;

src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.DiscardingCloseable;
 import it.cavallium.dbengine.database.SafeCloseable;

src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java

@@ -1,8 +1,6 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.ReadableComponent;
-import io.netty5.buffer.api.ReadableComponentProcessor;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.SafeCloseable;
 import java.io.DataInput;

src/main/java/it/cavallium/dbengine/database/serialization/BufferDataOutput.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.io.DataOutput;
 import java.nio.charset.StandardCharsets;
 import org.jetbrains.annotations.NotNull;

src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import java.io.IOError;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import io.netty5.util.internal.StringUtil;
 import it.cavallium.dbengine.database.LLUtils;

src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.database.serialization;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Send;
 import it.cavallium.dbengine.database.LLUtils;
 import java.nio.charset.StandardCharsets;

src/main/java/it/cavallium/dbengine/lucene/ByteArrayCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class ByteArrayCodec implements HugePqCodec<byte[]> {

src/main/java/it/cavallium/dbengine/lucene/BytesRefCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 import org.apache.lucene.util.BytesRef;
 

src/main/java/it/cavallium/dbengine/lucene/DoubleCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class DoubleCodec implements HugePqCodec<Double> {

src/main/java/it/cavallium/dbengine/lucene/FloatCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class FloatCodec implements HugePqCodec<Float> {

src/main/java/it/cavallium/dbengine/lucene/HugePqArray.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.DiscardingCloseable;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.SafeCloseable;

src/main/java/it/cavallium/dbengine/lucene/HugePqCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.NumericUtils;

src/main/java/it/cavallium/dbengine/lucene/HugePqPriorityQueue.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLUtils;
 import it.cavallium.dbengine.database.SafeCloseable;

src/main/java/it/cavallium/dbengine/lucene/IntCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class IntCodec implements HugePqCodec<Integer> {

src/main/java/it/cavallium/dbengine/lucene/LLFieldDocCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.ArrayList;
 import java.util.function.Function;
 

src/main/java/it/cavallium/dbengine/lucene/LLScoreDocCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class LLScoreDocCodec implements HugePqCodec<LLScoreDoc> {

src/main/java/it/cavallium/dbengine/lucene/LLSlotDocCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import it.cavallium.dbengine.database.DiscardingCloseable;
 import it.cavallium.dbengine.database.SafeCloseable;
 import it.cavallium.dbengine.database.disk.LLTempHugePqEnv;

src/main/java/it/cavallium/dbengine/lucene/LongCodec.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import java.util.function.Function;
 
 public class LongCodec implements HugePqCodec<Long> {

src/main/java/it/cavallium/dbengine/lucene/LuceneRocksDBManager.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene;
 
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import it.cavallium.dbengine.lucene.directory.RocksDBInstance;
 import it.cavallium.dbengine.lucene.directory.RocksdbFileStore;
 import java.io.IOException;

src/main/java/it/cavallium/dbengine/lucene/directory/Lucene90NoCompressionStoredFieldsFormat.java

@@ -26,6 +26,7 @@ import org.apache.lucene.codecs.compressing.Decompressor;
 import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat;
 import org.apache.lucene.index.FieldInfos;
 import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.store.ByteBuffersDataInput;
 import org.apache.lucene.store.DataInput;
 import org.apache.lucene.store.DataOutput;
 import org.apache.lucene.store.Directory;
@@ -76,8 +77,8 @@ public class Lucene90NoCompressionStoredFieldsFormat extends StoredFieldsFormat
 	private static final Compressor DUMMY_COMPRESSOR = new Compressor() {
 
 		@Override
-		public void compress(byte[] bytes, int off, int len, DataOutput out) throws IOException {
+		public void compress(ByteBuffersDataInput byteBuffersDataInput, DataOutput dataOutput) throws IOException {
-			out.writeBytes(bytes, off, len);
+			dataOutput.copyBytes(byteBuffersDataInput, byteBuffersDataInput.size());
 		}
 
 		@Override

src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java

@@ -1,8 +1,8 @@
 package it.cavallium.dbengine.lucene.directory;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.BufferRef;
+import io.netty5.buffer.BufferRef;
 import org.apache.lucene.store.IndexInput;
 
 import java.io.EOFException;

src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbDirectory.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.lucene.directory;
 
 import com.google.common.util.concurrent.Striped;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;

src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbFileStore.java

@@ -2,10 +2,9 @@ package it.cavallium.dbengine.lucene.directory;
 
 import com.google.common.primitives.Longs;
 import com.google.common.util.concurrent.Striped;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.ReadableComponent;
+import io.netty5.buffer.BufferComponent;
-import io.netty5.buffer.api.WritableComponent;
 import it.cavallium.dbengine.database.LLUtils;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -119,13 +118,13 @@ public class RocksdbFileStore {
 
 	private static ByteBuffer readableNioBuffer(Buffer buffer) {
 		assert buffer.countReadableComponents() == 1 : "Readable components count: " + buffer.countReadableComponents();
-		return ((ReadableComponent) buffer).readableBuffer();
+		return ((BufferComponent) buffer).readableBuffer();
 	}
 
 	private static ByteBuffer writableNioBuffer(Buffer buffer, int newWriterOffset) {
 		assert buffer.countWritableComponents() == 1 : "Writable components count: " + buffer.countWritableComponents();
 		buffer.writerOffset(0).ensureWritable(newWriterOffset);
-		var byteBuf = ((WritableComponent) buffer).writableBuffer();
+		var byteBuf = ((BufferComponent) buffer).writableBuffer();
 		buffer.writerOffset(newWriterOffset);
 		assert buffer.capacity() >= newWriterOffset : "Returned capacity " + buffer.capacity() + " < " + newWriterOffset;
 		return byteBuf;

src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbInputStream.java

@@ -1,7 +1,7 @@
 package it.cavallium.dbengine.lucene.directory;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
 import java.io.EOFException;
 import java.io.IOException;
 import org.apache.lucene.store.IndexInput;

src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbOutputStream.java

@@ -1,6 +1,6 @@
 package it.cavallium.dbengine.lucene.directory;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import org.apache.lucene.store.BufferedChecksum;
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.Accountable;

src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java

@@ -1,11 +1,11 @@
 package it.cavallium.dbengine.lucene.searcher;
 
-import io.netty5.buffer.api.Drop;
+import io.netty5.buffer.Drop;
-import io.netty5.buffer.api.Owned;
+import io.netty5.buffer.Owned;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
 import it.cavallium.dbengine.database.DiscardingCloseable;
 import it.cavallium.dbengine.database.LLKeyScore;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.utils.SimpleResource;
 import java.util.Objects;
 import org.apache.logging.log4j.LogManager;

src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java

@@ -7,7 +7,7 @@ import static it.cavallium.dbengine.lucene.searcher.CurrentPageInfo.EMPTY_STATUS
 import static it.cavallium.dbengine.lucene.searcher.PaginationInfo.MAX_SINGLE_SEARCH_LIMIT;
 
 import io.netty5.util.Send;
-import io.netty5.buffer.api.internal.ResourceSupport;
+import io.netty5.buffer.internal.ResourceSupport;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
 import it.cavallium.dbengine.database.LLKeyScore;
 import it.cavallium.dbengine.database.LLUtils;

src/main/java/it/cavallium/dbengine/netty/NettyMetrics.java

@@ -4,12 +4,12 @@ import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.MeterBinder;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.BufferAllocator;
-import io.netty5.buffer.api.pool.BufferAllocatorMetric;
+import io.netty5.buffer.pool.BufferAllocatorMetric;
-import io.netty5.buffer.api.pool.BufferAllocatorMetricProvider;
+import io.netty5.buffer.pool.BufferAllocatorMetricProvider;
-import io.netty5.buffer.api.pool.PoolArenaMetric;
+import io.netty5.buffer.pool.PoolArenaMetric;
-import io.netty5.buffer.api.pool.PoolChunkListMetric;
+import io.netty5.buffer.pool.PoolChunkListMetric;
-import io.netty5.buffer.api.pool.PoolSubpageMetric;
+import io.netty5.buffer.pool.PoolSubpageMetric;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;