File tree Expand file tree Collapse file tree 4 files changed +8
-9
lines changed
aws-xray-recorder-sdk-aws-sdk-core/src/test/java/com/amazonaws/xray/handlers/config
aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray Expand file tree Collapse file tree 4 files changed +8
-9
lines changed Original file line number Diff line number Diff line change 1818import com .fasterxml .jackson .core .JsonParser ;
1919import com .fasterxml .jackson .databind .DeserializationFeature ;
2020import com .fasterxml .jackson .databind .ObjectMapper ;
21- import com .fasterxml .jackson .databind .PropertyNamingStrategy ;
21+ import com .fasterxml .jackson .databind .PropertyNamingStrategies ;
2222import java .net .URL ;
2323import java .util .HashSet ;
2424import org .junit .Assert ;
@@ -35,7 +35,7 @@ public class AWSServiceHandlerManifestTest {
3535 AWSServiceHandlerManifestTest .class .getResource ("/com/amazonaws/xray/handlers/config/OperationParameterWhitelist.json" );
3636
3737 private ObjectMapper mapper = new ObjectMapper ()
38- .setPropertyNamingStrategy (PropertyNamingStrategy . CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES )
38+ .setPropertyNamingStrategy (PropertyNamingStrategies . SNAKE_CASE )
3939 .configure (DeserializationFeature .FAIL_ON_UNKNOWN_PROPERTIES , false )
4040 .configure (JsonParser .Feature .ALLOW_COMMENTS , true );
4141
Original file line number Diff line number Diff line change 2727import com .fasterxml .jackson .databind .JsonSerializer ;
2828import com .fasterxml .jackson .databind .Module ;
2929import com .fasterxml .jackson .databind .ObjectMapper ;
30- import com .fasterxml .jackson .databind .PropertyNamingStrategy ;
30+ import com .fasterxml .jackson .databind .PropertyNamingStrategies ;
3131import com .fasterxml .jackson .databind .SerializationConfig ;
3232import com .fasterxml .jackson .databind .SerializationFeature ;
3333import com .fasterxml .jackson .databind .annotation .JsonSerialize ;
@@ -59,7 +59,7 @@ public abstract class EntityImpl implements Entity {
5959 @ Deprecated
6060 protected static final ObjectMapper mapper = new ObjectMapper ()
6161 .configure (SerializationFeature .FAIL_ON_EMPTY_BEANS , false )
62- .setPropertyNamingStrategy (PropertyNamingStrategy . CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES )
62+ .setPropertyNamingStrategy (PropertyNamingStrategies . SNAKE_CASE )
6363 .setSerializationInclusion (JsonInclude .Include .NON_EMPTY );
6464
6565 private static final Log logger = LogFactory .getLog (EntityImpl .class );
Original file line number Diff line number Diff line change 2828import com .fasterxml .jackson .databind .DeserializationContext ;
2929import com .fasterxml .jackson .databind .ObjectMapper ;
3030import com .fasterxml .jackson .databind .PropertyName ;
31- import com .fasterxml .jackson .databind .PropertyNamingStrategy ;
31+ import com .fasterxml .jackson .databind .PropertyNamingStrategies ;
3232import com .fasterxml .jackson .databind .deser .std .StdDeserializer ;
3333import com .fasterxml .jackson .databind .introspect .Annotated ;
3434import com .fasterxml .jackson .databind .introspect .AnnotatedMember ;
@@ -62,8 +62,7 @@ public class UnsignedXrayClient {
6262 // Visible for testing
6363 static final ObjectMapper OBJECT_MAPPER = new ObjectMapper ()
6464 .setSerializationInclusion (Include .NON_EMPTY )
65- // Use deprecated field to support older Jackson versions for now.
66- .setPropertyNamingStrategy (PropertyNamingStrategy .PASCAL_CASE_TO_CAMEL_CASE )
65+ .setPropertyNamingStrategy (PropertyNamingStrategies .UPPER_CAMEL_CASE )
6766 .registerModule (new SimpleModule ().addDeserializer (Date .class , new FloatDateDeserializer ()))
6867 .setAnnotationIntrospector (new JacksonAnnotationIntrospector () {
6968 @ Override
Original file line number Diff line number Diff line change 2020import com .fasterxml .jackson .core .JsonParser ;
2121import com .fasterxml .jackson .databind .DeserializationFeature ;
2222import com .fasterxml .jackson .databind .ObjectMapper ;
23- import com .fasterxml .jackson .databind .PropertyNamingStrategy ;
23+ import com .fasterxml .jackson .databind .PropertyNamingStrategies ;
2424import java .io .IOException ;
2525import java .net .URL ;
2626import java .util .ArrayList ;
@@ -52,7 +52,7 @@ public class LocalizedSamplingStrategy implements SamplingStrategy {
5252
5353 private static final ObjectMapper MAPPER =
5454 new ObjectMapper ()
55- .setPropertyNamingStrategy (PropertyNamingStrategy . CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES )
55+ .setPropertyNamingStrategy (PropertyNamingStrategies . SNAKE_CASE )
5656 .configure (DeserializationFeature .FAIL_ON_UNKNOWN_PROPERTIES , false )
5757 .configure (JsonParser .Feature .ALLOW_COMMENTS , true );
5858
You can’t perform that action at this time.
0 commit comments