fix byte array deserialization

Adyen · Sep 15, 2023 · 840299b · 840299b
1 parent 943dcfb
commit 840299b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/com/adyen/model/marketpayaccount/JSON.java b/src/main/java/com/adyen/model/marketpayaccount/JSON.java
@@ -1,5 +1,6 @@
 package com.adyen.model.marketpayaccount;
 
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.adyen.serializer.ByteArraySerializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
@@ -33,6 +34,7 @@ public JSON() {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }
 

diff --git a/src/main/java/com/adyen/serializer/ByteArrayDeserializer.java b/src/main/java/com/adyen/serializer/ByteArrayDeserializer.java
@@ -0,0 +1,20 @@
+package com.adyen.serializer;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class ByteArrayDeserializer extends StdDeserializer<byte[]> {
+    public ByteArrayDeserializer() {
+        super(byte[].class);
+    }
+
+    @Override
+    public byte[] deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
+        return jsonParser.getValueAsString().getBytes(StandardCharsets.UTF_8);
+    }
+}
diff --git a/src/test/java/com/adyen/MarketPayTest.java b/src/test/java/com/adyen/MarketPayTest.java
@@ -119,6 +119,7 @@ public void testAccountApi() throws IOException, ApiException, HTTPClientExcepti
                 "}");
         String jsonRequest = request.toJson();
         GetTaxFormResponse response = GetTaxFormResponse.fromJson("{\n" +
+                "  \"content\": \"AQIDBAUGBwgJCgsMDQ4PEBESExQ=\",\n" +
                 "  \"contentType\": \"String\",\n" +
                 "  \"invalidFields\": [\n" +
                 "    {\n" +
@@ -135,8 +136,8 @@ public void testAccountApi() throws IOException, ApiException, HTTPClientExcepti
                 "  \"resultCode\": \"string\"\n" +
                 "}");
         // For some reason setting this content byte [] is broken
-        // response.setContent("U29tZXJhbmRvbXN0cmluZ0Jhc2U2NEVuY29kZWQ".getBytes(StandardCharsets.UTF_8));
         String json = response.toJson();
+        System.out.println(new String(response.getContent()));
         Client client = createMockClientFromResponse(json);
         ClassicPlatformAccountApi api = new ClassicPlatformAccountApi(client);
 

diff --git a/templates/libraries/jersey3/JSON.mustache b/templates/libraries/jersey3/JSON.mustache
@@ -1,6 +1,7 @@
 package {{modelPackage}};
 
 import com.adyen.serializer.ByteArraySerializer;
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -48,6 +49,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }