Merge pull request quarkusio#47820 from geoand/client-multipart-polish

Polish client multipart handling

Author: gsmet

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java

@@ -474,14 +474,13 @@ private int defaultPort(boolean isHttps) {
 
     private QuarkusMultipartFormUpload setMultipartHeadersAndPrepareBody(HttpClientRequest httpClientRequest,
             RestClientRequestContext state) throws Exception {
-        if (!(state.getEntity().getEntity() instanceof QuarkusMultipartForm)) {
+        if (!(state.getEntity().getEntity() instanceof QuarkusMultipartForm multipartForm)) {
             throw new IllegalArgumentException(
                     "Multipart form upload expects an entity of type MultipartForm, got: " + state.getEntity().getEntity());
         }
 
         MultivaluedMap<String, String> headerMap = state.getRequestHeadersAsMap();
         updateRequestHeadersFromConfig(state, headerMap);
-        QuarkusMultipartForm multipartForm = (QuarkusMultipartForm) state.getEntity().getEntity();
         multipartForm.preparePojos(state);
 
         Object property = state.getConfiguration().getProperty(QuarkusRestClientProperties.MULTIPART_ENCODER_MODE);

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/PausableHttpPostRequestEncoder.java

@@ -511,8 +511,7 @@ public void addBodyHttpData(InterfaceHttpData data) throws ErrorDataEncoderExcep
         }
         bodyListDatas.add(checkNotNull(data, "data"));
         if (!isMultipart) {
-            if (data instanceof Attribute) {
-                Attribute attribute = (Attribute) data;
+            if (data instanceof Attribute attribute) {
                 try {
                     // name=value& with encoded name and attribute
                     String key = encodeAttribute(attribute.getName(), charset);
@@ -523,9 +522,8 @@ public void addBodyHttpData(InterfaceHttpData data) throws ErrorDataEncoderExcep
                 } catch (IOException e) {
                     throw new ErrorDataEncoderException(e);
                 }
-            } else if (data instanceof FileUpload) {
+            } else if (data instanceof FileUpload fileUpload) {
                 // since not Multipart, only name=filename => Attribute
-                FileUpload fileUpload = (FileUpload) data;
                 // name=filename& with encoded name and filename
                 String key = encodeAttribute(fileUpload.getName(), charset);
                 String value = encodeAttribute(fileUpload.getFilename(), charset);
@@ -567,7 +565,7 @@ public void addBodyHttpData(InterfaceHttpData data) throws ErrorDataEncoderExcep
          * if duringmixedmode: endmixedmultipart + endmultipart
          * else only endmultipart
          */
-        if (data instanceof Attribute) {
+        if (data instanceof Attribute attribute) {
             if (duringMixedMode) {
                 QuarkusInternalAttribute internal = new QuarkusInternalAttribute(charset);
                 internal.addValue("\r\n--" + multipartMixedBoundary + "--");
@@ -583,7 +581,6 @@ public void addBodyHttpData(InterfaceHttpData data) throws ErrorDataEncoderExcep
             }
             internal.addValue("--" + multipartDataBoundary + "\r\n");
             // content-disposition: form-data; name="field1"
-            Attribute attribute = (Attribute) data;
             internal.addValue(HttpHeaderNames.CONTENT_DISPOSITION + ": " + HttpHeaderValues.FORM_DATA + "; "
                     + HttpHeaderValues.NAME + "=\"" + attribute.getName() + "\"\r\n");
             // Add Content-Length: xxx
@@ -602,8 +599,7 @@ public void addBodyHttpData(InterfaceHttpData data) throws ErrorDataEncoderExcep
             multipartHttpDatas.add(internal);
             multipartHttpDatas.add(data);
             globalBodySize += attribute.length() + internal.size();
-        } else if (data instanceof FileUpload) {
-            FileUpload fileUpload = (FileUpload) data;
+        } else if (data instanceof FileUpload fileUpload) {
             QuarkusInternalAttribute internal = new QuarkusInternalAttribute(charset);
             if (!multipartHttpDatas.isEmpty()) {
                 // previously a data field so CRLF
@@ -856,8 +852,7 @@ public HttpRequest finalizeRequest() throws ErrorDataEncoderException {
         } else {
             // get the only one body and set it to the request
             HttpContent chunk = nextChunk();
-            if (request instanceof FullHttpRequest) {
-                FullHttpRequest fullRequest = (FullHttpRequest) request;
+            if (request instanceof FullHttpRequest fullRequest) {
                 ByteBuf chunkContent = chunk.content();
                 if (fullRequest.content() != chunkContent && chunkContent != null) {
                     fullRequest.content().clear().writeBytes(chunkContent);

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java

@@ -47,7 +47,8 @@ public QuarkusMultipartFormUpload(Context context,
         this.context = context;
         this.pending = new InboundBuffer<>(context)
                 .handler(this::handleChunk)
-                .drainHandler(v -> run()).pause();
+                .drainHandler(v -> run())
+                .pause();
         this.request = new DefaultFullHttpRequest(
                 HttpVersion.HTTP_1_1,
                 io.netty.handler.codec.http.HttpMethod.POST,