Skip to content

Commit 26f9a2f

Browse files
Remove usage of deprecated jackson property (#391)
1 parent 398ec05 commit 26f9a2f

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

aws-xray-recorder-sdk-aws-sdk-core/src/test/java/com/amazonaws/xray/handlers/config/AWSServiceHandlerManifestTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.fasterxml.jackson.core.JsonParser;
1919
import com.fasterxml.jackson.databind.DeserializationFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
21+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2222
import java.net.URL;
2323
import java.util.HashSet;
2424
import 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

aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/entities/EntityImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.fasterxml.jackson.databind.JsonSerializer;
2828
import com.fasterxml.jackson.databind.Module;
2929
import com.fasterxml.jackson.databind.ObjectMapper;
30-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
30+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
3131
import com.fasterxml.jackson.databind.SerializationConfig;
3232
import com.fasterxml.jackson.databind.SerializationFeature;
3333
import 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);

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.fasterxml.jackson.databind.DeserializationContext;
2929
import com.fasterxml.jackson.databind.ObjectMapper;
3030
import com.fasterxml.jackson.databind.PropertyName;
31-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
31+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
3232
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
3333
import com.fasterxml.jackson.databind.introspect.Annotated;
3434
import 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

aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.fasterxml.jackson.core.JsonParser;
2121
import com.fasterxml.jackson.databind.DeserializationFeature;
2222
import com.fasterxml.jackson.databind.ObjectMapper;
23-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
23+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2424
import java.io.IOException;
2525
import java.net.URL;
2626
import 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

0 commit comments

Comments
 (0)