Merge pull request #31389 from geoand/#31298-again

Properly test fix UUID support in Reactive REST Client multipart support

Author: Sgitario

integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartClient.java

@@ -1,6 +1,7 @@
 package io.quarkus.it.rest.client.multipart;
 
 import java.io.File;
+import java.util.UUID;
 
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.FormParam;
@@ -179,6 +180,10 @@ class FileWithPojo {
         @PartType(MediaType.APPLICATION_JSON)
         private Pojo pojo;
 
+        @FormParam("uuid")
+        @PartType(MediaType.TEXT_PLAIN)
+        private UUID uuid;
+
         public String getFileName() {
             return fileName;
         }
@@ -194,6 +199,14 @@ public Pojo getPojo() {
         public void setPojo(Pojo pojo) {
             this.pojo = pojo;
         }
+
+        public UUID getUuid() {
+            return uuid;
+        }
+
+        public void setUuid(UUID uuid) {
+            this.uuid = uuid;
+        }
     }
 
     class Pojo {

integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartResource.java

@@ -10,6 +10,7 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DefaultValue;
@@ -74,6 +75,7 @@ public String sendByteArrayWithPojo(@RestQuery @DefaultValue("true") Boolean wit
         FileWithPojo data = new FileWithPojo();
         data.file = HELLO_WORLD.getBytes(UTF_8);
         data.setFileName(GREETING_TXT);
+        data.setUuid(UUID.randomUUID());
         if (withPojo) {
             Pojo pojo = new Pojo();
             pojo.setName("some-name");
@@ -398,11 +400,12 @@ public String consumeText(@MultipartForm MultipartBodyWithTextFile2 body) {
     @Path("/echo/with-pojo")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     public String consumeBinaryWithPojo(@MultipartForm MultipartBodyWithBinaryFileAndPojo fileWithPojo) {
-        return String.format("fileOk:%s,nameOk:%s,pojoOk:%s",
+        return String.format("fileOk:%s,nameOk:%s,pojoOk:%s,uuidNull:%s",
                 containsHelloWorld(fileWithPojo.file),
                 GREETING_TXT.equals(fileWithPojo.fileName),
                 fileWithPojo.pojo == null ? "null"
-                        : "some-name".equals(fileWithPojo.pojo.getName()) && "some-value".equals(fileWithPojo.pojo.getValue()));
+                        : "some-name".equals(fileWithPojo.pojo.getName()) && "some-value".equals(fileWithPojo.pojo.getValue()),
+                fileWithPojo.uuid == null);
     }
 
     @GET
@@ -494,6 +497,10 @@ public static class MultipartBodyWithBinaryFileAndPojo {
         @FormParam("pojo")
         @PartType(MediaType.APPLICATION_JSON)
         public Pojo pojo;
+
+        @FormParam("uuid")
+        @PartType(MediaType.TEXT_PLAIN)
+        public String uuid;
     }
 
 }

integration-tests/rest-client-reactive-multipart/src/test/java/io/quarkus/it/rest/client/multipart/MultipartResourceTest.java

@@ -270,13 +270,13 @@ public void shouldSendByteArrayAndPojo() {
         .when().get("/client/byte-array-as-binary-file-with-pojo")
         .then()
                 .statusCode(200)
-                .body(equalTo("fileOk:true,nameOk:true,pojoOk:true"));
+                .body(equalTo("fileOk:true,nameOk:true,pojoOk:true,uuidNull:false"));
         given()
         .header("Content-Type", "text/plain")
 .when().get("/client/params/byte-array-as-binary-file-with-pojo")
 .then()
         .statusCode(200)
-        .body(equalTo("fileOk:true,nameOk:true,pojoOk:true"));
+        .body(equalTo("fileOk:true,nameOk:true,pojoOk:true,uuidNull:true"));
         // @formatter:on
     }
 
@@ -289,14 +289,14 @@ public void shouldSendByteArrayAndPojoWithNullPojo() {
         .when().get("/client/byte-array-as-binary-file-with-pojo")
         .then()
                 .statusCode(200)
-                .body(equalTo("fileOk:true,nameOk:true,pojoOk:null"));
+                .body(equalTo("fileOk:true,nameOk:true,pojoOk:null,uuidNull:false"));
         given()
         .queryParam("withPojo", "false")
         .header("Content-Type", "text/plain")
 .when().get("/client/params/byte-array-as-binary-file-with-pojo")
 .then()
         .statusCode(200)
-        .body(equalTo("fileOk:true,nameOk:true,pojoOk:null"));
+        .body(equalTo("fileOk:true,nameOk:true,pojoOk:null,uuidNull:true"));
         // @formatter:on
     }