Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/feature-AWSSDKforJavav2-9ffad97.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "feature",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Update Jackson and Jackson jr to 2.19.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import software.amazon.awssdk.thirdparty.jackson.core.JsonParseException;
import software.amazon.awssdk.thirdparty.jackson.core.JsonParser;
import software.amazon.awssdk.thirdparty.jackson.core.JsonToken;
import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature;
import software.amazon.awssdk.thirdparty.jackson.core.json.JsonReadFeature;

/**
Expand All @@ -46,6 +47,7 @@ public final class JsonNodeParser {
*/
public static final JsonFactory DEFAULT_JSON_FACTORY =
JsonFactory.builder()
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
.configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public final class AwsStructuredPlainJsonFactory {
private static final JsonFactory JSON_FACTORY = JsonFactory.builder()
.enable(StreamReadFeature.USE_FAST_BIG_NUMBER_PARSER)
.enable(StreamReadFeature.USE_FAST_DOUBLE_PARSER)
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
.enable(StreamWriteFeature.USE_FAST_DOUBLE_WRITER)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
import software.amazon.awssdk.thirdparty.jackson.core.StreamReadFeature;
import software.amazon.awssdk.utils.BinaryUtils;

public class SdkJsonGeneratorTest {
Expand All @@ -40,7 +41,7 @@ public class SdkJsonGeneratorTest {

@BeforeEach
public void setup() {
jsonGenerator = new SdkJsonGenerator(JsonFactory.builder().build(), "application/json");
jsonGenerator = new SdkJsonGenerator(JsonFactory.builder().enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build(), "application/json");
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
<awsjavasdk.version>${project.version}</awsjavasdk.version>
<awsjavasdk.previous.version>2.32.26</awsjavasdk.previous.version>
<awsjavasdk.previous-previous.version>2.32.25</awsjavasdk.previous-previous.version>
<jackson.version>2.15.2</jackson.version>
<jackson.databind.version>2.15.2</jackson.databind.version>
<jacksonjr.version>2.17.3</jacksonjr.version>
<jackson.version>2.19.0</jackson.version>
<jackson.databind.version>2.19.0</jackson.databind.version>
<jacksonjr.version>2.19.0</jacksonjr.version>
<eventstream.version>1.0.1</eventstream.version>
<commons.lang.version>3.14.0</commons.lang.version>
<wiremock.version>2.32.0</wiremock.version>
Expand Down
Loading