Ensure that body content is adapted before being serialized.

gk-brown · gk-brown · commit dfbe6d62e6f2 · 2021-02-21T07:28:11.000-05:00
diff --git a/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java b/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java
@@ -482,7 +482,7 @@ public String getContentType() {
                 public void encodeRequest(OutputStream outputStream) throws IOException {
                     JSONEncoder jsonEncoder = new JSONEncoder();
 
-                    jsonEncoder.write(body, outputStream);
+                    jsonEncoder.write(BeanAdapter.adapt(body), outputStream);
                 }
             };
         } else if (method.equalsIgnoreCase("POST") && this.requestHandler == null) {
diff --git a/httprpc-test/src/test/java/org/httprpc/WebServiceProxyTest.java b/httprpc-test/src/test/java/org/httprpc/WebServiceProxyTest.java
@@ -14,6 +14,7 @@
 
 package org.httprpc;
 
+import org.httprpc.beans.BeanAdapter;
 import org.junit.jupiter.api.Test;
 
 import javax.imageio.ImageIO;
@@ -59,6 +60,13 @@ interface AttachmentInfo {
             int getChecksum();
         }
 
+        interface Body {
+            String getString();
+            List<String> getStrings();
+            int getNumber();
+            boolean getFlag();
+        }
+
         @RequestMethod("GET")
         @ResourcePath("a/?:a/b/?:b/c/?:c/d/?:d")
         Map<String, ?> testGetKeys() throws IOException;
@@ -73,7 +81,7 @@ Response testMultipartPost(String string, List<String> strings, int number, bool
             List<URL> attachments) throws IOException;
 
         @RequestMethod("POST")
-        Map<String, ?> testBodyPost(int id) throws IOException;
+        Body testBodyPost(int id) throws IOException;
 
         @RequestMethod("GET")
         @ResourcePath("headers")
@@ -252,25 +260,25 @@ public void testMultipartPost() throws IOException {
 
     @Test
     public void testCustomBodyPost() throws IOException {
-        Map<String, ?> content = mapOf(
+        TestService.Body body = BeanAdapter.adapt(mapOf(
             entry("string", "héllo&gøod+bye?"),
             entry("strings", listOf("a", "b", "c")),
             entry("number", 123L),
             entry("flag", true)
-        );
+        ), TestService.Body.class);
 
         TestService testService = WebServiceProxy.adapt(new URL(serverURL, "test/"), TestService.class,
             (resourcePath) -> null, (method, url) -> {
             WebServiceProxy webServiceProxy = new WebServiceProxy(method, url);
 
-            webServiceProxy.setBody(content);
+            webServiceProxy.setBody(body);
 
             return webServiceProxy;
         });
 
-        Map<String, ?> result = testService.testBodyPost(101);
+        TestService.Body result = testService.testBodyPost(101);
 
-        assertEquals(content, result);
+        assertEquals(body, result);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ public String getContentType() {`
`482`	`482`	`public void encodeRequest(OutputStream outputStream) throws IOException {`
`483`	`483`	`JSONEncoder jsonEncoder = new JSONEncoder();`
`484`	`484`
`485`		`- jsonEncoder.write(body, outputStream);`
	`485`	`+ jsonEncoder.write(BeanAdapter.adapt(body), outputStream);`
`486`	`486`	`}`
`487`	`487`	`};`
`488`	`488`	`} else if (method.equalsIgnoreCase("POST") && this.requestHandler == null) {`