refactor to use jackson directly

Author: RanVaknin

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/StrategyJsonSerializer.java

@@ -1,12 +1,13 @@
 package software.amazon.awssdk.enhanced.dynamodb.internal.document;
 
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+import java.io.StringWriter;
 import java.util.Map;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.protocols.json.SdkJsonGenerator;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
+import software.amazon.awssdk.thirdparty.jackson.core.JsonGenerator;
 
 @SdkInternalApi
 public final class StrategyJsonSerializer {
@@ -17,37 +18,37 @@ private StrategyJsonSerializer() {
     private enum JsonSerializationStrategy {
         NULL {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeNull();
             }
         },
         STRING {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
-                generator.writeValue(av.s());
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
+                generator.writeString(av.s());
             }
         },
         NUMBER {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeNumber(av.n());
             }
         },
         BOOLEAN {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
-                generator.writeValue(av.bool());
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
+                generator.writeBoolean(av.bool());
             }
         },
         BYTES {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
-                generator.writeValue(av.b().asByteBuffer());
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
+                generator.writeBinary(av.b().asByteArray());
             }
         },
         LIST {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeStartArray();
                 for (AttributeValue item : av.l()) {
                     serializeAttributeValue(generator, item);
@@ -57,7 +58,7 @@ public void serialize(SdkJsonGenerator generator, AttributeValue av) {
         },
         MAP {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeStartObject();
                 for (Map.Entry<String, AttributeValue> entry : av.m().entrySet()) {
                     generator.writeFieldName(entry.getKey());
@@ -68,17 +69,17 @@ public void serialize(SdkJsonGenerator generator, AttributeValue av) {
         },
         STRING_SET {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeStartArray();
                 for (String s : av.ss()) {
-                    generator.writeValue(s);
+                    generator.writeString(s);
                 }
                 generator.writeEndArray();
             }
         },
         NUMBER_SET {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeStartArray();
                 for (String n : av.ns()) {
                     generator.writeNumber(n);
@@ -88,36 +89,38 @@ public void serialize(SdkJsonGenerator generator, AttributeValue av) {
         },
         BYTES_SET {
             @Override
-            public void serialize(SdkJsonGenerator generator, AttributeValue av) {
+            public void serialize(JsonGenerator generator, AttributeValue av) throws IOException {
                 generator.writeStartArray();
                 for (SdkBytes b : av.bs()) {
-                    generator.writeValue(b.asByteBuffer());
+                    generator.writeBinary(b.asByteArray());
                 }
                 generator.writeEndArray();
             }
         };
 
-        public abstract void serialize(SdkJsonGenerator generator, AttributeValue av);
+        public abstract void serialize(JsonGenerator generator, AttributeValue av) throws IOException;
     }
 
     public static String serializeAttributeValueMap(Map<String, AttributeValue> map) {
-        SdkJsonGenerator jsonGen = new SdkJsonGenerator(new JsonFactory(), "application/json");
-
-        jsonGen.writeStartObject();
-        for (Map.Entry<String, AttributeValue> entry : map.entrySet()) {
-            jsonGen.writeFieldName(entry.getKey());
-            serializeAttributeValue(jsonGen, entry.getValue());
+        StringWriter writer = new StringWriter();
+        try (JsonGenerator generator = new JsonFactory().createGenerator(writer)) {
+            generator.writeStartObject();
+            for (Map.Entry<String, AttributeValue> entry : map.entrySet()) {
+                generator.writeFieldName(entry.getKey());
+                serializeAttributeValue(generator, entry.getValue());
+            }
+            generator.writeEndObject();
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to serialize AttributeValue map to JSON", e);
         }
-        jsonGen.writeEndObject();
-
-        return new String(jsonGen.getBytes(), StandardCharsets.UTF_8);
+        return writer.toString();
     }
 
-
-    public static void serializeAttributeValue(SdkJsonGenerator generator, AttributeValue av) {
+    private static void serializeAttributeValue(JsonGenerator generator, AttributeValue av) throws IOException {
         JsonSerializationStrategy strategy = getStrategy(av);
         strategy.serialize(generator, av);
     }
+
     private static JsonSerializationStrategy getStrategy(AttributeValue av) {
         if (av.nul() != null && av.nul()) return JsonSerializationStrategy.NULL;
         if (av.s() != null) return JsonSerializationStrategy.STRING;

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/document/DocumentTableSchemaTest.java

@@ -247,20 +247,5 @@ void validate_toJson_WithNonAsciiEmoji() {
 
         String json = doc.toJson();
         assertThat(json).isEqualTo("{\"emoji\":\"Hello 😀 World\"}");
-
-
-        /*
-        BEHAVIOR CHANGE: the new toJson() implementation does not result in the same output.
-        This is because SdkJsonGenerator uses ByteArrayOutputStream which writes raw UTF-8 bytes.
-        Jackson's UTF-8 generator automatically escapes non-ASCII characters as \\uXXXX" sequences
-        when writing to byte streams.
-
-        The previous implementation used addEscapeCharacters from JsonStringFormatHelper which only
-        escapes control characters, quotes, and backslashes, but leaving emojis as literal UTF-8.
-
-        org.opentest4j.AssertionFailedError:
-            expected: "{"emoji":"Hello 😀 World"}"
-            but was: "{"emoji":"Hello \uD83D\uDE00 World"}"
-        */
     }
 }