Use DefaultHttpClient builder

build.gradle

@@ -9,4 +9,5 @@ tasks.withType(Javadoc).configureEach {
 
 repositories {
     mavenCentral()
+    maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
 }

buildSrc/src/main/groovy/io.micronaut.build.internal.ocisdk-metadata-module.gradle

@@ -13,6 +13,7 @@ dependencies {
 
 repositories {
     mavenCentral()
+    maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
 }
 
 sourceSets {

buildSrc/src/main/groovy/io.micronaut.build.internal.oraclecloud-base.gradle

@@ -5,6 +5,7 @@ plugins {
 repositories {
     repositories {
         mavenCentral()
+        maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
     }
 }
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-micronaut = "4.6.2"
+micronaut = "4.7.0-SNAPSHOT"
 micronaut-platform = "4.5.1"
 micronaut-docs = "2.0.0"
 fn = '1.0.190'

oraclecloud-httpclient-netty/src/main/java/io/micronaut/oraclecloud/httpclient/netty/NettyHttpClient.java

@@ -63,8 +63,6 @@ final class NettyHttpClient implements HttpClient {
     final List<RequestInterceptor> requestInterceptors;
     final List<OciNettyClientFilter<?>> nettyClientFilter;
     final ExecutorService blockingIoExecutor;
-    final String host;
-    final int port;
     final boolean buffered;
     final Closeable upstreamHttpClient;
     final ConnectionManager connectionManager;
@@ -92,7 +90,7 @@ final class NettyHttpClient implements HttpClient {
             if (builder.properties.containsKey(StandardClientProperties.READ_TIMEOUT)) {
                 cfg.setReadTimeout((Duration) builder.properties.get(StandardClientProperties.READ_TIMEOUT));
             }
-            mnClient = new DefaultHttpClient((URI) null, cfg);
+            mnClient = DefaultHttpClient.builder().configuration(cfg).build();
             blockingIoExecutor = Executors.newCachedThreadPool();
             jsonMapper = OciSdkMicronautSerializer.getDefaultObjectMapper();
         } else {
@@ -134,9 +132,7 @@ final class NettyHttpClient implements HttpClient {
             nettyClientFilter = Collections.emptyList();
         }
 
-        requestKey = new DefaultHttpClient.RequestKey(mnClient, builder.baseUri);
-        this.port = builder.baseUri.getPort();
-        this.host = builder.baseUri.getHost();
+        requestKey = new DefaultHttpClient.RequestKey(mnClient, this.baseUri);
         this.buffered = builder.buffered;
     }
 

oraclecloud-oke-workload-identity/src/main/java/io/micronaut/oraclecloud/oke/workload/identity/MicronautOkeWorkloadIdentityResourcePrincipalsFederationClient.java

@@ -29,26 +29,10 @@
 import com.oracle.bmc.http.internal.LogHeadersFilter;
 import com.oracle.bmc.http.signing.RequestSigner;
 import com.oracle.bmc.util.internal.StringUtils;
-import io.micronaut.buffer.netty.NettyByteBufferFactory;
-import io.micronaut.core.annotation.AnnotationMetadataResolver;
-import io.micronaut.core.convert.ConversionService;
 import io.micronaut.core.io.ResourceResolver;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.body.ContextlessMessageBodyHandlerRegistry;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import io.micronaut.http.codec.MediaTypeCodecRegistry;
-import io.micronaut.http.netty.body.NettyByteBufMessageBodyHandler;
-import io.micronaut.http.netty.body.NettyJsonHandler;
-import io.micronaut.http.netty.body.NettyJsonStreamHandler;
-import io.micronaut.http.netty.body.NettyWritableBodyWriter;
-import io.micronaut.json.JsonMapper;
-import io.micronaut.json.codec.JsonMediaTypeCodec;
-import io.micronaut.json.codec.JsonStreamMediaTypeCodec;
 import io.micronaut.oraclecloud.httpclient.netty.ManagedNettyHttpProvider;
 import io.micronaut.oraclecloud.httpclient.netty.OciNettyClientFilter;
-import io.micronaut.runtime.ApplicationConfiguration;
-import io.netty.channel.MultithreadEventLoopGroup;
-import io.netty.util.concurrent.DefaultThreadFactory;
 
 import javax.net.ssl.TrustManagerFactory;
 import java.io.FileInputStream;
@@ -145,28 +129,11 @@ public static OkeNettyClientSslBuilder okeNettyClientSslBuilder(String path) {
     }
 
     DefaultHttpClient defaultHttpClient() {
-        JsonMapper mapper = JsonMapper.createDefault();
-        ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration();
-        ContextlessMessageBodyHandlerRegistry registry = new ContextlessMessageBodyHandlerRegistry(
-            applicationConfiguration,
-            NettyByteBufferFactory.DEFAULT,
-            new NettyByteBufMessageBodyHandler(),
-            new NettyWritableBodyWriter(applicationConfiguration)
-        );
-        registry.add(MediaType.APPLICATION_JSON_TYPE, new NettyJsonHandler<>(mapper));
-        registry.add(MediaType.APPLICATION_JSON_STREAM_TYPE, new NettyJsonStreamHandler<>(mapper));
         // Set ca cert when talking to proxymux using https.
-
-        return new DefaultHttpClient(null,
-            getOkeHttpClientConfiguration(), null, new DefaultThreadFactory(MultithreadEventLoopGroup.class),
-            okeNettyClientSslBuilder(KUBERNETES_SERVICE_ACCOUNT_CERT_PATH),
-            MediaTypeCodecRegistry.of(
-                new JsonMediaTypeCodec(mapper, applicationConfiguration, null),
-                new JsonStreamMediaTypeCodec(mapper, applicationConfiguration, null)
-            ),
-            registry,
-            AnnotationMetadataResolver.DEFAULT,
-            ConversionService.SHARED);
+        return DefaultHttpClient.builder()
+            .configuration(getOkeHttpClientConfiguration())
+            .nettyClientSslBuilder(okeNettyClientSslBuilder(KUBERNETES_SERVICE_ACCOUNT_CERT_PATH))
+            .build();
     }
 
     @Override

settings.gradle.kts

@@ -10,6 +10,13 @@ pluginManagement {
     includeBuild("settings-build-logic")
 }
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        maven { setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots") }
+    }
+}
+
 buildscript {
     configurations {
         classpath {