Correct merge

micronaut-projects · Oct 21, 2022 · 671a37a · 671a37a
1 parent c67e2b1
commit 671a37a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java b/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java
@@ -2399,7 +2399,7 @@ protected void removeHandler(ChannelHandlerContext ctx) {
         }
 
         @Override
-        protected void buildResponse(Promise<? super HttpResponse<?>> promise, StreamedHttpResponse msg) {
+        protected void buildResponse(Promise<? super MutableHttpResponse<?>> promise, StreamedHttpResponse msg) {
             promise.trySuccess(new NettyStreamedHttpResponse<>(msg, conversionService));
         }
 

diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/DefaultNettyHttpClientRegistry.java b/http-client/src/main/java/io/micronaut/http/client/netty/DefaultNettyHttpClientRegistry.java
@@ -421,7 +421,6 @@ private DefaultHttpClient buildClient(
                 resolveSocketChannelFactory(configuration, beanContext),
                 clientCustomizer,
                 invocationInstrumenterFactories,
-                clientId
                 clientId,
                 conversionService
         );

diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/MutableHttpRequestWrapper.java b/http-client/src/main/java/io/micronaut/http/client/netty/MutableHttpRequestWrapper.java
@@ -39,19 +39,19 @@
  */
 @Internal
 final class MutableHttpRequestWrapper<B> extends HttpRequestWrapper<B> implements MutableHttpRequest<B> {
-    private final ConversionService<?> conversionService;
+    private ConversionService conversionService;
 
     @Nullable
     private B body;
     @Nullable
     private URI uri;
 
-    MutableHttpRequestWrapper(ConversionService<?> conversionService, HttpRequest<B> delegate) {
+    MutableHttpRequestWrapper(ConversionService conversionService, HttpRequest<B> delegate) {
         super(delegate);
         this.conversionService = conversionService;
     }
 
-    static MutableHttpRequest<?> wrapIfNecessary(ConversionService<?> conversionService, HttpRequest<?> request) {
+    static MutableHttpRequest<?> wrapIfNecessary(ConversionService conversionService, HttpRequest<?> request) {
         if (request instanceof MutableHttpRequest<?>) {
             return (MutableHttpRequest<?>) request;
         } else {
@@ -128,4 +128,9 @@ public <T> MutableHttpRequest<T> body(T body) {
         this.body = (B) body;
         return (MutableHttpRequest<T>) this;
     }
+
+    @Override
+    public void setConversionService(ConversionService conversionService) {
+        this.conversionService = conversionService;
+    }
 }