feat: replace FormBody with a BodyPublisher

#296
bsorrentino · Oct 17, 2023 · bbf6980 · bbf6980
1 parent 1ebd081
commit bbf6980
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 53 deletions.
diff --git a/...src/main/java/org/bsc/confluence/rest/scrollversions/ScrollVersionsConfluenceService.java b/...src/main/java/org/bsc/confluence/rest/scrollversions/ScrollVersionsConfluenceService.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.bsc.confluence.ConfluenceService;
-import org.bsc.confluence.rest.FormBody;
+import org.bsc.confluence.rest.FormUrlEncodedBodyPublisher;
 import org.bsc.confluence.rest.RESTConfluenceService;
 import org.bsc.confluence.rest.scrollversions.model.ScrollVersions;
 import org.bsc.ssl.SSLCertificateInfo;
@@ -15,7 +15,10 @@
 import java.net.URL;
 import java.net.http.HttpRequest;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
@@ -344,15 +347,14 @@ CompletableFuture<ScrollVersions.Model.NewPageResult> createVersionPage(String s
             return CompletableFuture.failedFuture(e);
         }
 
-        final var body = new FormBody.Builder()
-                .add("parentConfluenceId", masterPageId.toString() )
-                .add( "versionId", version.getId() )
-                .add( "pageTitle", title )
-                .build()
-                ;
+        final var body = new FormUrlEncodedBodyPublisher( Map.of(
+        "parentConfluenceId", masterPageId.toString(),
+        "versionId", version.getId(),
+        "pageTitle", title
+        ));
 
         final var request = newRequestBuilder()
-                .header("Content-Type", FormBody.getContentType())
+                .header("Content-Type", body.getContentType())
                 .uri(url)
                 .POST(body)
                 ;
@@ -403,16 +405,15 @@ CompletableFuture<ScrollVersions.Model.NewPageResult> manageVersionPage(Model.ID
             return CompletableFuture.failedFuture(e);
         }
 
-        final var body = new FormBody.Builder()
-                .add("masterPageId", masterPageId.toString() )
-                .add( "pageTitle", title)
-                .add( "versionId", version.getId() )
-                .add( "changeType", changeType.typeName )
-                .build()
+        final var body = new FormUrlEncodedBodyPublisher( Map.of(
+                "masterPageId", masterPageId.toString(),
+                "pageTitle", title,
+                "versionId", version.getId(),
+                "changeType", changeType.typeName))
                 ;
 
         final var request = newRequestBuilder()
-                .header("Content-Type", FormBody.getContentType())
+                .header("Content-Type", body.getContentType())
                 .uri(url)
                 .POST(body)
                 ;

diff --git a/service-rest-api/src/main/java/org/bsc/confluence/rest/FormBody.java b/service-rest-api/src/main/java/org/bsc/confluence/rest/FormBody.java
diff --git a/service-rest-api/src/main/java/org/bsc/confluence/rest/FormUrlEncodedBodyPublisher.java b/service-rest-api/src/main/java/org/bsc/confluence/rest/FormUrlEncodedBodyPublisher.java
@@ -0,0 +1,41 @@
+package org.bsc.confluence.rest;
+
+import java.net.http.HttpRequest;
+import java.net.URLEncoder;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.Flow;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+
+public class FormUrlEncodedBodyPublisher implements HttpRequest.BodyPublisher {
+
+    private final byte[] data;
+
+    public final String getContentType() {
+        return "application/x-www-form-urlencoded";
+    }
+    public FormUrlEncodedBodyPublisher(Map<String, String> fields) {
+
+        data = fields.entrySet().stream()
+                .map(kv -> format("%s=%s",
+                        URLEncoder.encode(kv.getKey(), StandardCharsets.UTF_8),
+                        URLEncoder.encode(kv.getValue(), StandardCharsets.UTF_8)))
+                .collect(Collectors.joining("&"))
+                .getBytes(StandardCharsets.UTF_8);;
+
+    }
+
+    @Override
+    public long contentLength() {
+        return data.length;
+    }
+
+    @Override
+    public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+        subscriber.onNext(ByteBuffer.wrap(data));
+        subscriber.onComplete();
+    }
+}