Skip to content

Commit acf630d

Browse files
authored
Handle unknown fields in sampler APIs response (#425)
1 parent 5997a56 commit acf630d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/internal/UnsignedXrayClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2727
import com.fasterxml.jackson.core.JsonParser;
2828
import com.fasterxml.jackson.databind.DeserializationContext;
29+
import com.fasterxml.jackson.databind.DeserializationFeature;
2930
import com.fasterxml.jackson.databind.ObjectMapper;
3031
import com.fasterxml.jackson.databind.PropertyName;
3132
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
@@ -61,6 +62,7 @@ public class UnsignedXrayClient {
6162

6263
// Visible for testing
6364
static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
65+
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
6466
.setSerializationInclusion(Include.NON_EMPTY)
6567
.setPropertyNamingStrategy(PropertyNamingStrategies.UPPER_CAMEL_CASE)
6668
.registerModule(new SimpleModule().addDeserializer(Date.class, new FloatDateDeserializer()))

aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/internal/UnsignedXrayClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ public class UnsignedXrayClientTest {
175175
+ " \"FixedRate\": 0.1,\n"
176176
+ " \"ReservoirQuota\": 2,\n"
177177
+ " \"ReservoirQuotaTTL\": 1530923107.0,\n"
178-
+ " \"Interval\": 10\n"
178+
+ " \"Interval\": 10,\n"
179+
+ " \"Foo\": \"bar\"\n"
179180
+ " },\n"
180181
+ " {\n"
181182
+ " \"RuleName\": \"polling-scorekeep\",\n"

0 commit comments

Comments
 (0)