disable fail on empty beans serializer (aws#293)

Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
willarmiros · Aug 5, 2021 · a94a013 · a94a013
1 parent d9d17ec
commit a94a013
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/EntityImpl.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/EntityImpl.java
@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.NullNode;
@@ -58,6 +59,7 @@ public abstract class EntityImpl implements Entity {
     @Deprecated
     protected static final ObjectMapper mapper = new ObjectMapper()
         .findAndRegisterModules()
+        .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
         .setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES)
         .setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
 

diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/entities/EntityTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/entities/EntityTest.java
@@ -67,4 +67,16 @@ void testDateSerialization() {
         String expected = "{\"default\":{\"date\":1616559298000}}";
         assertThat(serializedSeg).contains(expected);
     }
+
+    @Test
+    void testUnknownClassSerialization() {
+        Segment seg = new SegmentImpl(AWSXRay.getGlobalRecorder(), "test");
+        seg.putAws("coolService", new EmptyBean());
+        seg.end();
+        seg.serialize();  // Verify we don't crash here
+    }
+
+    static class EmptyBean {
+        String otherField = "cerealization";
+    }
 }