java: Don't override customer transformationParams

Author: svix-mman

java/lib/src/main/java/com/svix/api/Message.java

@@ -1,6 +1,8 @@
 // this file is @generated
 package com.svix.api;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.svix.SvixHttpClient;
 import com.svix.Utils;
 import com.svix.exceptions.ApiException;
@@ -135,10 +137,23 @@ public MessageOut create(
         if (options.idempotencyKey != null) {
             headers.put("idempotency-key", options.idempotencyKey);
         }
-        HashMap<String, Object> trParam = new HashMap<>();
-        trParam.put("rawPayload", messageIn.getPayload());
-        messageIn.setTransformationsParams(trParam);
-        messageIn.setPayload("");
+        if (messageIn.getTransformationsParams() != null) {
+            // load in the transformationsParams
+            ObjectMapper mapper = new ObjectMapper();
+            String trParamsJson = mapper.writeValueAsString(messageIn.getTransformationsParams());
+            ObjectNode loadedTrParams = mapper.readValue(trParamsJson, ObjectNode.class);
+            // only set rawPayload if not already set
+            if (loadedTrParams.get("rawPayload") == null) {
+                loadedTrParams.put("rawPayload", messageIn.getPayload());
+            }
+            messageIn.setTransformationsParams(loadedTrParams);
+            messageIn.setPayload("");
+        } else {
+            HashMap<String, Object> trParam = new HashMap<>();
+            trParam.put("rawPayload", messageIn.getPayload());
+            messageIn.setTransformationsParams(trParam);
+            messageIn.setPayload("");
+        }
         return this.client.executeRequest(
                 "POST", url.build(), Headers.of(headers), messageIn, MessageOut.class);
     }

java/lib/src/test/com/svix/test/WiremockTests.java

@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 public class WiremockTests {
     @Rule
@@ -458,4 +459,52 @@ public void octothorpeInUrlQuery() throws Exception {
 
         wireMockRule.verify(1, getRequestedFor(urlEqualTo("/api/v1/app/app1/msg?tag=test%23test")));
     }
+
+    @Test
+    public void headersInTransformationParamsNotOverwritten() throws Exception {
+        Svix svx = testClient();
+        wireMockRule.stubFor(
+                WireMock.post(urlEqualTo("/api/v1/app/app1/msg"))
+                        .willReturn(WireMock.ok().withBodyFile("MessageOut.json")));
+
+        String jsonPayload = "{\"key\":\"val\",\"key1\":[\"list\"]}";
+        MessageIn msg = new MessageIn().payload(jsonPayload).eventType("event.type").transformationsParams(Map.of("headers",Map.of( "header-key","header-val")));
+        svx.getMessage().create("app1", msg);
+
+        // file in java/lib/src/test/resources/__files/ExpectedMsgCreateBodyWithHeaders.json
+        String expectedBody =
+                wireMockRule
+                        .getOptions()
+                        .filesRoot()
+                        .getTextFileNamed("__files/ExpectedMsgCreateBodyWithHeaders.json")
+                        .readContentsAsString();
+        wireMockRule.verify(
+                1,
+                postRequestedFor(urlEqualTo("/api/v1/app/app1/msg"))
+                        .withRequestBody(equalTo(expectedBody)));
+    }
+    @Test
+    public void jsonEncodedMessageIn() throws Exception {
+        Svix svx = testClient();
+        wireMockRule.stubFor(
+                WireMock.post(urlEqualTo("/api/v1/app/app1/msg"))
+                        .willReturn(WireMock.ok().withBodyFile("MessageOut.json")));
+
+        String jsonPayload = "{\"key\":\"val\",\"key1\":[\"list\"]}";
+        MessageIn msg = new MessageIn().payload(jsonPayload).eventType("event.type");
+        svx.getMessage().create("app1", msg);
+
+        // file in java/lib/src/test/resources/__files/ExpectedMsgCreateBody2.json
+        String expectedBody =
+                wireMockRule
+                        .getOptions()
+                        .filesRoot()
+                        .getTextFileNamed("__files/ExpectedMsgCreateBody2.json")
+                        .readContentsAsString();
+        wireMockRule.verify(
+                1,
+                postRequestedFor(urlEqualTo("/api/v1/app/app1/msg"))
+                        .withRequestBody(equalTo(expectedBody)));
+    }
+
 }

java/lib/src/test/resources/__files/ExpectedMsgCreateBody2.json

@@ -0,0 +1 @@
+{"eventType":"event.type","payload":"","transformationsParams":{"rawPayload":"{\"key\":\"val\",\"key1\":[\"list\"]}"}}

java/lib/src/test/resources/__files/ExpectedMsgCreateBodyWithHeaders.json

@@ -0,0 +1 @@
+{"eventType":"event.type","payload":"","transformationsParams":{"headers":{"header-key":"header-val"},"rawPayload":"{\"key\":\"val\",\"key1\":[\"list\"]}"}}

java/templates/api_extra/message_create_body.java

@@ -1,4 +1,17 @@
-HashMap<String, Object> trParam = new HashMap<>();
-trParam.put("rawPayload", messageIn.getPayload());
-messageIn.setTransformationsParams(trParam);
-messageIn.setPayload("");
+if (messageIn.getTransformationsParams() != null) {
+    // load in the transformationsParams
+    ObjectMapper mapper = new ObjectMapper();
+    String trParamsJson = mapper.writeValueAsString(messageIn.getTransformationsParams());
+    ObjectNode loadedTrParams = mapper.readValue(trParamsJson, ObjectNode.class);
+    // only set rawPayload if not already set
+    if (loadedTrParams.get("rawPayload") == null) {
+        loadedTrParams.put("rawPayload", messageIn.getPayload());
+    }
+    messageIn.setTransformationsParams(loadedTrParams);
+    messageIn.setPayload("");
+} else {
+    HashMap<String, Object> trParam = new HashMap<>();
+    trParam.put("rawPayload", messageIn.getPayload());
+    messageIn.setTransformationsParams(trParam);
+    messageIn.setPayload("");
+}

java/templates/api_resource.java.jinja

@@ -10,6 +10,8 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.HashMap;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import okhttp3.Headers;
 import okhttp3.HttpUrl;