Refactor Serializer to share factory

Author: RanVaknin

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

@@ -193,7 +193,7 @@ public String getJson(String attributeName) {
         if (attributeValue == null) {
             return null;
         }
-        return stringValue(JSON_ATTRIBUTE_CONVERTER.transformTo(attributeValue));
+        return StrategyJsonSerializer.serializeSingleAttributeValue(attributeValue);
     }
 
     @Override

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

@@ -10,6 +10,10 @@
 
 @SdkInternalApi
 public final class StrategyJsonSerializer {
+    private static final JsonFactory jsonFactory = new JsonFactory();
+
+    private StrategyJsonSerializer() {
+    }
 
     private enum JsonSerializationStrategy {
         NULL,
@@ -25,7 +29,7 @@ private enum JsonSerializationStrategy {
     }
 
     public static String serializeAttributeValueMap(Map<String, AttributeValue> map) {
-        SdkJsonGenerator jsonGen = new SdkJsonGenerator(new JsonFactory(), "application/json");
+        SdkJsonGenerator jsonGen = new SdkJsonGenerator(jsonFactory, "application/json"); // re-use factory
 
         jsonGen.writeStartObject();
         map.forEach((key, value) -> {
@@ -37,6 +41,12 @@ public static String serializeAttributeValueMap(Map<String, AttributeValue> map)
         return new String(jsonGen.getBytes(), StandardCharsets.UTF_8);
     }
 
+    public static String serializeSingleAttributeValue(AttributeValue av) {
+        SdkJsonGenerator jsonGen = new SdkJsonGenerator(jsonFactory, "application/json"); // re-use factory
+        serializeAttributeValue(jsonGen, av);
+        return new String(jsonGen.getBytes(), StandardCharsets.UTF_8);
+    }
+
     public static void serializeAttributeValue(SdkJsonGenerator generator, AttributeValue av) {
         JsonSerializationStrategy strategy = getStrategy(av);
 

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

@@ -632,4 +632,26 @@ void toJson_emoji() {
     assertThat(json).isEqualTo("{\"emoji\":" + emoji + "}");
     }
 
+    @Test
+    void getJson_returnsRawValue() {
+        EnhancedDocument doc = EnhancedDocument.builder()
+            .attributeConverterProviders(defaultProvider())
+            .putString("key", "value")
+            .build();
+
+        String result = doc.getJson("key");
+        assertThat(result).isEqualTo("\"value\"");
+    }
+
+    @Test
+    void getJson_nonExistentAttribute() {
+        EnhancedDocument doc = EnhancedDocument.builder()
+            .attributeConverterProviders(defaultProvider())
+            .putString("exists", "value")
+            .build();
+
+        String result = doc.getJson("doesNotExist");
+        assertThat(result).isNull();
+    }
+
 }

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/JsonConversionBenchmark.java

@@ -25,6 +25,7 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
 import software.amazon.awssdk.enhanced.dynamodb.document.EnhancedDocument;
 import com.amazonaws.services.dynamodbv2.document.Item;
 
@@ -41,18 +42,137 @@
 @State(Scope.Benchmark)
 public class JsonConversionBenchmark {
 
-    private String jsonString;
     private EnhancedDocument v2Document;
     private Item v1Item;
 
+    private EnhancedDocument entireDoc;
+    private EnhancedDocument doc50b;
+    private EnhancedDocument doc100b;
+    private EnhancedDocument doc500b;
+    private EnhancedDocument doc1kb;
+    private Item v1Item50b;
+    private Item v1Item100b;
+    private Item v1Item500b;
+    private Item v1Item1kb;
+
     @Setup
     public void setup() throws IOException {
-        jsonString = new String(Files
-                                    .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/large_data.json")));
-        v2Document = EnhancedDocument.fromJson(jsonString);
-        v1Item = Item.fromJSON(jsonString);
+        String entireJsonString = new String(Files
+            .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/large_data.json")));
+        String payload50b = new String(Files
+            .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_50b.json")));
+        String payload100b = new String(Files
+            .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_100b.json")));
+        String payload500b = new String(Files
+            .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_500b.json")));
+        String payload1kb = new String(Files
+            .readAllBytes(Paths.get("src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_1kb.json")));
+
+
+        v2Document = EnhancedDocument.fromJson(entireJsonString);
+        v1Item = Item.fromJSON(entireJsonString);
+
+        v1Item.withJSON("entireDocument", entireJsonString);
+
+        entireDoc = EnhancedDocument.builder()
+            .addAttributeConverterProvider(AttributeConverterProvider.defaultProvider())
+            .putString("id", "entireDoc")
+            .putJson("entireDocument", entireJsonString)
+            .build();
+
+        doc50b = EnhancedDocument.builder()
+            .addAttributeConverterProvider(AttributeConverterProvider.defaultProvider())
+            .putString("id", "test")
+            .putJson("data", payload50b)
+            .build();
+
+        doc100b = EnhancedDocument.builder()
+            .addAttributeConverterProvider(AttributeConverterProvider.defaultProvider())
+            .putString("id", "test")
+            .putJson("data", payload100b)
+            .build();
+
+        doc500b = EnhancedDocument.builder()
+            .addAttributeConverterProvider(AttributeConverterProvider.defaultProvider())
+            .putString("id", "test")
+            .putJson("data", payload500b)
+            .build();
+
+        doc1kb = EnhancedDocument.builder()
+            .addAttributeConverterProvider(AttributeConverterProvider.defaultProvider())
+            .putString("id", "test")
+            .putJson("data", payload1kb)
+            .build();
+
+        v1Item50b = new Item()
+            .withString("id", "test")
+            .withJSON("data", payload50b);
+
+        v1Item100b = new Item()
+            .withString("id", "test")
+            .withJSON("data", payload100b);
+
+        v1Item500b = new Item()
+            .withString("id", "test")
+            .withJSON("data", payload500b);
+
+        v1Item1kb = new Item()
+            .withString("id", "test")
+            .withJSON("data", payload1kb);
+    }
+
+    // getJson() meant to get a sub structure of a larger json file. testing with different sizes.
+    @Benchmark
+    public String getJson50b() {
+        return doc50b.getJson("data");
+    }
+
+    @Benchmark
+    public String getJson100b() {
+        return doc100b.getJson("data");
+    }
+
+    @Benchmark
+    public String getJson500b() {
+        return doc500b.getJson("data");
     }
 
+    @Benchmark
+    public String getJson1kb() {
+        return doc1kb.getJson("data");
+    }
+
+    @Benchmark
+    public String v1GetJson50b() {
+        return v1Item50b.getJSON("data");
+    }
+
+    @Benchmark
+    public String v1GetJson100b() {
+        return v1Item100b.getJSON("data");
+    }
+
+    @Benchmark
+    public String v1GetJson500b() {
+        return v1Item500b.getJSON("data");
+    }
+
+    @Benchmark
+    public String v1GetJson1kb() {
+        return v1Item1kb.getJSON("data");
+    }
+    
+    @Benchmark
+    public String v1GetJsonEntireDoc() {
+        return v1Item.getJSON("entireDocument");
+    }
+
+    @Benchmark
+    public String v2GetJsonEntireDoc() {
+        return entireDoc.getJson("entireDocument");
+    }
+
+    // toJson() benchmarking (only for large data set)
     @Benchmark
     public String v1ToJson() {
         return v1Item.toJSON();
@@ -62,4 +182,5 @@ public String v1ToJson() {
     public String v2ToJson() {
         return v2Document.toJson();
     }
+
 }

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/large_data.json

@@ -0,0 +1 @@
+{"id":"test-100","name":"Sample Document","version":1,"tags":["tag1","tag2","tag3"],"active":true}

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_100b.json

@@ -0,0 +1 @@
+{"orderId":"ORD-2024-10-28-001","customer":{"customerId":"CUST-98765","name":"Jane Smith","email":"[email protected]","phone":"+1-555-9876","shippingAddress":{"street":"456 Oak Avenue","city":"Portland","state":"OR","zip":"97201","country":"USA"},"billingAddress":{"street":"456 Oak Avenue","city":"Portland","state":"OR","zip":"97201","country":"USA"}},"items":[{"sku":"PROD-001","name":"Wireless Headphones","quantity":2,"price":79.99,"discount":10.0},{"sku":"PROD-002","name":"USB-C Cable","quantity":3,"price":12.99,"discount":0.0},{"sku":"PROD-003","name":"Phone Case","quantity":1,"price":24.99,"discount":5.0}],"payment":{"method":"credit_card","cardLast4":"4242","amount":234.92,"currency":"USD","transactionId":"TXN-ABC123XYZ"},"shipping":{"carrier":"UPS","trackingNumber":"1Z999AA10123456784","estimatedDelivery":"2024-11-02T17:00:00Z","shippingCost":8.99},"metadata":{"orderDate":"2024-10-28T11:15:00Z","status":"processing","notes":"Gift wrap requested","tags":["priority","gift","insured"]}}

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_1kb.json

@@ -0,0 +1 @@
+{"userId":"user-12345","profile":{"firstName":"John","lastName":"Doe","email":"[email protected]","phone":"+1-555-0123","address":{"street":"123 Main St","city":"Seattle","state":"WA","zip":"98101"},"preferences":{"theme":"dark","notifications":true,"language":"en-US"}},"metadata":{"createdAt":"2024-01-15T10:30:00Z","lastLogin":"2024-10-28T09:15:00Z","loginCount":247,"accountType":"premium","tags":["verified","active","beta-tester"]}}

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/payload_500b.json

@@ -0,0 +1 @@
+{"id":"u123","name":"Alice","active":true}