Adapt to new Netty5 Header API

reactor-netty5-core/src/main/java/reactor/netty5/BufferFlux.java

@@ -16,9 +16,9 @@
 package reactor.netty5;
 
 import io.netty5.buffer.BufferInputStream;
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
+import io.netty5.buffer.CompositeBuffer;
 import io.netty5.util.Send;
 import io.netty5.channel.socket.DatagramPacket;
 import io.netty5.handler.codec.http.HttpContent;
@@ -39,7 +39,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 
 /**
  * A decorating {@link Flux} {@link NettyInbound} with various {@link Buffer} related

reactor-netty5-core/src/main/java/reactor/netty5/BufferMono.java

@@ -16,9 +16,9 @@
 package reactor.netty5;
 
 import io.netty5.buffer.BufferInputStream;
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
+import io.netty5.buffer.CompositeBuffer;
 import org.reactivestreams.Publisher;
 import reactor.core.CoreSubscriber;
 import reactor.core.Fuseable;
@@ -30,7 +30,7 @@
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static java.util.Objects.requireNonNull;
 
 /**

reactor-netty5-core/src/main/java/reactor/netty5/NettyOutbound.java

@@ -30,8 +30,8 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.channel.Channel;
 import io.netty5.channel.DefaultFileRegion;
 import io.netty5.handler.stream.ChunkedNioFile;

reactor-netty5-core/src/main/java/reactor/netty5/ReactorNetty.java

@@ -36,9 +36,9 @@
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import io.netty5.buffer.BufferUtil;
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.BufferHolder;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
+import io.netty5.buffer.BufferHolder;
 import io.netty5.channel.nio.AbstractNioChannel;
 import io.netty5.util.Resource;
 import io.netty5.channel.Channel;

reactor-netty5-core/src/main/java/reactor/netty5/channel/AbstractChannelMetricsHandler.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5.channel;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.ChannelHandler;
 import io.netty5.channel.ChannelHandlerAdapter;
 import io.netty5.channel.ChannelHandlerContext;

reactor-netty5-core/src/main/java/reactor/netty5/channel/ChannelOperations.java

@@ -23,8 +23,8 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.util.Resource;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelHandler;

reactor-netty5-core/src/main/java/reactor/netty5/channel/ChannelOperationsHandler.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5.channel;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.channel.ChannelHandlerAdapter;
 import io.netty5.channel.ChannelHandlerContext;

reactor-netty5-core/src/main/java/reactor/netty5/channel/MonoSend.java

@@ -21,7 +21,7 @@
 import java.util.function.ToIntFunction;
 
 import io.netty.buffer.ByteBufHolder;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelHandlerContext;

reactor-netty5-core/src/main/java/reactor/netty5/channel/MonoSendMany.java

@@ -30,7 +30,7 @@
 import java.util.stream.Stream;
 
 import io.netty.buffer.ByteBufHolder;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelHandlerContext;

reactor-netty5-core/src/main/java/reactor/netty5/transport/BufferAllocatorMetrics.java

@@ -17,8 +17,8 @@
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.Tags;
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.pool.BufferAllocatorMetric;
+import io.netty5.buffer.BufferAllocator;
+import io.netty5.buffer.pool.BufferAllocatorMetric;
 import reactor.netty5.internal.util.MapUtils;
 
 import java.util.concurrent.ConcurrentHashMap;

reactor-netty5-core/src/main/java/reactor/netty5/transport/Transport.java

@@ -22,7 +22,7 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.ChannelOption;
 import io.netty5.channel.EventLoopGroup;
 import io.netty5.channel.group.ChannelGroup;

reactor-netty5-core/src/main/java/reactor/netty5/transport/TransportConfig.java

@@ -23,8 +23,8 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
-import io.netty5.buffer.api.BufferAllocator;
-import io.netty5.buffer.api.pool.BufferAllocatorMetricProvider;
+import io.netty5.buffer.BufferAllocator;
+import io.netty5.buffer.pool.BufferAllocatorMetricProvider;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelFactory;
 import io.netty5.channel.ChannelInitializer;

reactor-netty5-core/src/main/java/reactor/netty5/transport/logging/AdvancedBufferFormat.java

@@ -18,7 +18,7 @@
 import java.nio.charset.Charset;
 
 import io.netty.buffer.ByteBufHolder;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.handler.logging.LogLevel;
 import io.netty5.handler.logging.LoggingHandler;
 

reactor-netty5-core/src/main/java/reactor/netty5/transport/logging/ReactorNettyLoggingHandler.java

@@ -21,7 +21,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;
 import io.netty5.buffer.BufferUtil;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelHandlerContext;
 import io.netty5.handler.logging.BufferFormat;

reactor-netty5-core/src/test/java/reactor/netty5/BufferFluxTest.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class BufferFluxTest {

reactor-netty5-core/src/test/java/reactor/netty5/BufferMonoTest.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -27,7 +27,7 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 
 class BufferMonoTest {
 	static final Random rndm = new Random();

reactor-netty5-core/src/test/java/reactor/netty5/NettyOutboundTest.java

@@ -34,8 +34,8 @@
 import java.util.function.Predicate;
 import javax.net.ssl.SSLException;
 
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
 import io.netty5.channel.ChannelHandlerContext;
 import io.netty5.channel.DefaultFileRegion;
 import io.netty5.channel.FileRegion;
@@ -53,7 +53,7 @@
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class NettyOutboundTest {

reactor-netty5-core/src/test/java/reactor/netty5/ReactorNettyTest.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.AbstractChannel;
 import io.netty5.channel.Channel;
 import io.netty5.channel.ChannelShutdownDirection;

reactor-netty5-core/src/test/java/reactor/netty5/channel/MonoSendManyTest.java

@@ -25,7 +25,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.util.Resource;
 import io.netty5.channel.ChannelHandlerAdapter;
 import io.netty5.channel.embedded.EmbeddedChannel;

reactor-netty5-core/src/test/java/reactor/netty5/tcp/TcpClientTests.java

@@ -40,7 +40,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.ChannelOption;
 import io.netty5.channel.EventLoopGroup;
 import io.netty5.channel.MultithreadEventLoopGroup;
@@ -70,7 +70,7 @@
 import reactor.util.Loggers;
 import reactor.util.retry.Retry;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assumptions.assumeThat;

reactor-netty5-core/src/test/java/reactor/netty5/tcp/TcpServerTests.java

@@ -43,7 +43,7 @@
 import javax.net.ssl.SNIHostName;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.AdaptiveReadHandleFactory;
 import io.netty5.channel.ChannelHandlerAdapter;
 import io.netty5.channel.ChannelHandlerContext;
@@ -82,7 +82,7 @@
 import reactor.util.Logger;
 import reactor.util.Loggers;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 

reactor-netty5-core/src/test/java/reactor/netty5/transport/logging/ReactorNettyLoggingHandlerTest.java

@@ -15,13 +15,13 @@
  */
 package reactor.netty5.transport.logging;
 
-import static io.netty5.buffer.api.DefaultBufferAllocators.preferredAllocator;
+import static io.netty5.buffer.DefaultBufferAllocators.preferredAllocator;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.nio.charset.Charset;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

reactor-netty5-core/src/test/java/reactor/netty5/udp/UdpClientTest.java

@@ -25,8 +25,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.CompositeBuffer;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.CompositeBuffer;
 import io.netty5.channel.EventLoopGroup;
 import io.netty5.channel.MultithreadEventLoopGroup;
 import io.netty5.channel.nio.NioHandler;

reactor-netty5-core/src/test/java/reactor/netty5/udp/UdpMetricsTests.java

@@ -23,7 +23,7 @@
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.micrometer.core.tck.MeterRegistryAssert;
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.socket.DatagramPacket;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/http/client/http2/H2Application.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5.examples.documentation.http.client.http2;
 
-import io.netty5.handler.codec.http.HttpHeaders;
+import io.netty5.handler.codec.http.headers.HttpHeaders;
 import reactor.core.publisher.Mono;
 import reactor.netty5.http.HttpProtocol;
 import reactor.netty5.http.client.HttpClient;
@@ -39,4 +39,4 @@ public static void main(String[] args) {
 		System.out.println("Used stream ID: " + response.getT2().get("x-http2-stream-id"));
 		System.out.println("Response: " + response.getT1());
 	}
-}
+}

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/http/client/http2/H2CApplication.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5.examples.documentation.http.client.http2;
 
-import io.netty5.handler.codec.http.HttpHeaders;
+import io.netty5.handler.codec.http.headers.HttpHeaders;
 import reactor.core.publisher.Mono;
 import reactor.netty5.http.HttpProtocol;
 import reactor.netty5.http.client.HttpClient;
@@ -38,4 +38,4 @@ public static void main(String[] args) {
 		System.out.println("Used stream ID: " + response.getT2().get("x-http2-stream-id"));
 		System.out.println("Response: " + response.getT1());
 	}
-}
+}

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/http/client/send/headers/Application.java

@@ -25,12 +25,12 @@ public class Application {
 	public static void main(String[] args) {
 		HttpClient client =
 				HttpClient.create()
-				          .headers(h -> h.set(HttpHeaderNames.CONTENT_LENGTH, 5)); //<1>
+				          .headers(h -> h.set(HttpHeaderNames.CONTENT_LENGTH, "5")); //<1>
 
 		client.post()
 		      .uri("https://example.com/")
 		      .send(BufferFlux.fromString(Mono.just("hello")))
 		      .response()
 		      .block();
 	}
-}
+}

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/http/server/clientaddress/CustomForwardedHeaderHandlerApplication.java

@@ -28,9 +28,9 @@ public static void main(String[] args) {
 		DisposableServer server =
 				HttpServer.create()
 				          .forwarded((connectionInfo, request) -> {  // <1>
-				              String hostHeader = request.headers().get("X-Forwarded-Host");
+				              CharSequence hostHeader = request.headers().get("X-Forwarded-Host");
 				              if (hostHeader != null) {
-				                  String[] hosts = hostHeader.split(",", 2);
+				                  String[] hosts = hostHeader.toString().split(",", 2);
 				                  InetSocketAddress hostAddress = AddressUtils.createUnresolved(
 				                      hosts[hosts.length - 1].trim(),
 				                      connectionInfo.getHostAddress().getPort());
@@ -48,4 +48,4 @@ public static void main(String[] args) {
 		server.onDispose()
 		      .block();
 	}
-}
+}

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/http/server/sse/Application.java

@@ -16,8 +16,8 @@
 package reactor.netty5.examples.documentation.http.server.sse;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.netty5.buffer.api.Buffer;
-import io.netty5.buffer.api.BufferAllocator;
+import io.netty5.buffer.Buffer;
+import io.netty5.buffer.BufferAllocator;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.netty5.DisposableServer;

reactor-netty5-examples/src/main/java/reactor/netty5/examples/documentation/udp/server/send/Application.java

@@ -15,7 +15,7 @@
  */
 package reactor.netty5.examples.documentation.udp.server.send;
 
-import io.netty5.buffer.api.Buffer;
+import io.netty5.buffer.Buffer;
 import io.netty5.channel.socket.DatagramPacket;
 import reactor.core.publisher.Mono;
 import reactor.netty5.Connection;