Merge branch 'release/1.0.0-RC4'

Author: vegegoku

.gitignore

@@ -66,6 +66,7 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 **/.vertx/
+**/file-uploads/
 .vertx/**/*.*
 **/war/*
-**/pom.xml.versionsBackup
+**/pom.xml.versionsBackup

domino-rest-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0-RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domino-rest-client/src/main/java/org/dominokit/rest/js/JsResponse.java

@@ -16,12 +16,12 @@
 package org.dominokit.rest.js;
 
 import elemental2.core.ArrayBuffer;
+import elemental2.dom.XMLHttpRequest;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jsinterop.base.Js;
 import org.dominokit.rest.shared.Response;
-import org.gwtproject.xhr.client.XMLHttpRequest;
 
 /** JS implementation for the {@link Response} */
 public class JsResponse implements Response {
@@ -52,19 +52,19 @@ public Map<String, String> getHeaders() {
   /** {@inheritDoc} */
   @Override
   public int getStatusCode() {
-    return request.getStatus();
+    return request.status;
   }
 
   /** {@inheritDoc} */
   @Override
   public String getStatusText() {
-    return request.getStatusText();
+    return request.statusText;
   }
 
   /** {@inheritDoc} */
   @Override
   public String getBodyAsString() {
-    return request.getResponseText();
+    return request.responseText;
   }
 
   /**
@@ -74,6 +74,6 @@ public String getBodyAsString() {
    * @return the content of the response as array buffer
    */
   public ArrayBuffer getResponseArrayBuffer() {
-    return Js.cast(request.getResponseArrayBuffer());
+    return Js.cast(request.response);
   }
 }

domino-rest-client/src/main/java/org/dominokit/rest/js/JsRestfulRequest.java

@@ -18,24 +18,31 @@
 import static java.util.Objects.nonNull;
 import static java.util.stream.Collectors.joining;
 
+import elemental2.core.ArrayBuffer;
+import elemental2.core.TypedArray;
+import elemental2.core.Uint8Array;
+import elemental2.dom.Blob;
+import elemental2.dom.BlobPropertyBag;
+import elemental2.dom.FormData;
+import elemental2.dom.XMLHttpRequest;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.dominokit.rest.shared.BaseRestfulRequest;
+import org.dominokit.rest.shared.MultipartForm;
 import org.dominokit.rest.shared.RestfulRequest;
 import org.dominokit.rest.shared.request.RequestTimeoutException;
 import org.gwtproject.timer.client.Timer;
-import org.gwtproject.xhr.client.XMLHttpRequest;
 
 /** JS implementation for {@link RestfulRequest} that uses {@link XMLHttpRequest} */
 public class JsRestfulRequest extends BaseRestfulRequest {
 
   public static final String CONTENT_TYPE = "Content-Type";
   public static final String APPLICATION_PDF = "application/pdf";
-  private XMLHttpRequest request;
-  private Map<String, List<String>> params = new LinkedHashMap<>();
-  private Map<String, String> headers = new LinkedHashMap<>();
+  private final XMLHttpRequest request;
+  private final Map<String, List<String>> params = new LinkedHashMap<>();
+  private final Map<String, String> headers = new LinkedHashMap<>();
   private final Timer timer =
       new Timer() {
         @Override
@@ -46,7 +53,7 @@ public void run() {
 
   public JsRestfulRequest(String uri, String method) {
     super(uri, method);
-    request = XMLHttpRequest.create();
+    request = new XMLHttpRequest();
     parseUri(uri);
   }
 
@@ -90,7 +97,7 @@ public RestfulRequest setQueryParam(String key, String value) {
   public RestfulRequest putHeader(String key, String value) {
     if (CONTENT_TYPE.equalsIgnoreCase(key)) {
       if (APPLICATION_PDF.equalsIgnoreCase(value)) {
-        request.setResponseType(XMLHttpRequest.ResponseType.ArrayBuffer);
+        request.responseType = "arraybuffer";
       }
     }
     headers.put(key, value);
@@ -138,6 +145,47 @@ public void sendJson(String json) {
     send(json);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public void sendMultipartForm(MultipartForm multipartForm) {
+    initRequest();
+    FormData data = new FormData();
+    for (MultipartForm.TextMultipart textMultipart : multipartForm.getTextMultiParts()) {
+      BlobPropertyBag blobPropertyBag = BlobPropertyBag.create();
+      blobPropertyBag.setType(textMultipart.contentType());
+      Blob blob =
+          new Blob(
+              new Blob.ConstructorBlobPartsArrayUnionType[] {
+                Blob.ConstructorBlobPartsArrayUnionType.of(textMultipart.value())
+              },
+              blobPropertyBag);
+      if (textMultipart.fileName().isPresent()) {
+        data.append(textMultipart.name(), blob, textMultipart.fileName().get());
+      } else {
+        data.append(textMultipart.name(), blob);
+      }
+    }
+    for (MultipartForm.FileMultipart fileMultipart : multipartForm.getFileMultiParts()) {
+      ArrayBuffer arrayBuffer = new ArrayBuffer(fileMultipart.value().length);
+      Uint8Array buffer = new Uint8Array(arrayBuffer);
+      buffer.set(TypedArray.SetArrayUnionType.of(fileMultipart.value()));
+      BlobPropertyBag options = BlobPropertyBag.create();
+      options.setType(fileMultipart.contentType());
+      Blob blob =
+          new Blob(
+              new Blob.ConstructorBlobPartsArrayUnionType[] {
+                Blob.ConstructorBlobPartsArrayUnionType.of(buffer)
+              },
+              options);
+      if (fileMultipart.fileName().isPresent()) {
+        data.append(fileMultipart.name(), blob, fileMultipart.fileName().get());
+      } else {
+        data.append(fileMultipart.name(), blob);
+      }
+    }
+    request.send(data);
+  }
+
   /** {@inheritDoc} */
   @Override
   public void send(String data) {
@@ -155,20 +203,20 @@ public void send() {
   /** {@inheritDoc} */
   @Override
   public void abort() {
-    request.clearOnReadyStateChange();
+    request.onreadystatechange = p0 -> null;
     request.abort();
   }
 
   /** {@inheritDoc} */
   @Override
   public void setWithCredentials(boolean withCredentials) {
-    request.setWithCredentials(withCredentials);
+    request.withCredentials = withCredentials;
   }
 
   /** {@inheritDoc} */
   @Override
   public RestfulRequest setResponseType(String responseType) {
-    request.setResponseType(responseType);
+    request.responseType = responseType;
     return this;
   }
 
@@ -180,22 +228,23 @@ private void initRequest() {
     String url = getUri();
     request.open(getMethod(), url);
     setHeaders();
-    request.setOnReadyStateChange(
+    request.onreadystatechange =
         xhr -> {
-          if (xhr.getReadyState() == XMLHttpRequest.DONE) {
-            xhr.clearOnReadyStateChange();
+          if (request.readyState == XMLHttpRequest.DONE) {
+            request.onreadystatechange = p0 -> null;
             timer.cancel();
-            successHandler.onResponseReceived(new JsResponse(xhr));
+            successHandler.onResponseReceived(new JsResponse(request));
           }
-        });
+          return null;
+        };
     if (getTimeout() > 0) {
       timer.schedule(getTimeout());
     }
   }
 
   private void fireOnTimeout() {
     timer.cancel();
-    request.clearOnReadyStateChange();
+    request.onreadystatechange = p0 -> null;
     request.abort();
     errorHandler.onError(new RequestTimeoutException());
   }

domino-rest-jaxrs/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-rest</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0-RC4</version>
     </parent>
 
     <artifactId>domino-rest-jaxrs</artifactId>

domino-rest-jvm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0-RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web-client</artifactId>
-            <version>3.8.5</version>
+            <version>3.9.6</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

domino-rest-jvm/src/main/java/org/dominokit/rest/jvm/JavaRestfulRequest.java

@@ -35,6 +35,7 @@
 import org.dominokit.rest.VertxInstanceProvider;
 import org.dominokit.rest.shared.BaseRestfulRequest;
 import org.dominokit.rest.shared.GwtIncompatible;
+import org.dominokit.rest.shared.MultipartForm;
 import org.dominokit.rest.shared.RestfulRequest;
 
 /** Java implementation for {@link RestfulRequest} that uses Vert.x {@link WebClient} */
@@ -123,6 +124,25 @@ public void sendJson(String json) {
     send(json);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public void sendMultipartForm(MultipartForm multipartForm) {
+    putHeader("Content-Type", "multipart/form-data");
+    io.vertx.ext.web.multipart.MultipartForm parts =
+        io.vertx.ext.web.multipart.MultipartForm.create();
+    for (MultipartForm.TextMultipart textMultipart : multipartForm.getTextMultiParts()) {
+      parts.attribute(textMultipart.name(), textMultipart.value());
+    }
+    for (MultipartForm.FileMultipart fileMultipart : multipartForm.getFileMultiParts()) {
+      parts.binaryFileUpload(
+          fileMultipart.name(),
+          fileMultipart.name(),
+          Buffer.buffer(fileMultipart.value()),
+          fileMultipart.contentType());
+    }
+    request.sendMultipartForm(parts, this::handleResponse);
+  }
+
   /** {@inheritDoc} */
   @Override
   public void send(String data) {

domino-rest-processor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0-RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>