BREAKING CHANGE: Upgrade to Jackson 3 #2162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,24 +17,24 @@ | |
| package com.expediagroup.graphql.client.jackson.serializers | ||
|
|
||
| import com.expediagroup.graphql.client.jackson.types.OptionalInput | ||
| import tools.jackson.core.JsonGenerator | ||
| import tools.jackson.databind.SerializationContext | ||
| import tools.jackson.databind.ValueSerializer | ||
|
|
||
|
Collaborator
Author
There was a problem hiding this comment. |
||
| class OptionalInputSerializer : ValueSerializer<OptionalInput<*>>() { | ||
|
|
||
|
Collaborator
Author
There was a problem hiding this comment. Renamed, and the default name of the parameter is |
||
| override fun isEmpty(ctxt: SerializationContext, value: OptionalInput<*>?): Boolean { | ||
| return value == OptionalInput.Undefined | ||
| } | ||
|
|
||
| override fun serialize(value: OptionalInput<*>, gen: JsonGenerator, ctxt: SerializationContext) { | ||
| when (value) { | ||
| is OptionalInput.Undefined -> return | ||
| is OptionalInput.Defined -> { | ||
| if (value.value == null) { | ||
| ctxt.defaultNullValueSerializer.serialize(value.value, gen, ctxt) | ||
| } else { | ||
| ctxt.findValueSerializer(value.value::class.java).serialize(value.value, gen, ctxt) | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,18 +32,22 @@ import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLError | |
| import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLResponse | ||
| import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLSourceLocation | ||
| import com.expediagroup.graphql.client.jackson.types.OptionalInput | ||
| import org.junit.jupiter.api.Test | ||
| import tools.jackson.databind.SerializationFeature | ||
| import tools.jackson.module.kotlin.jacksonMapperBuilder | ||
| import java.util.UUID | ||
| import kotlin.test.assertEquals | ||
|
|
||
| class GraphQLClientJacksonSerializerTest { | ||
|
|
||
| private val testMapper = jacksonMapperBuilder().enable(SerializationFeature.INDENT_OUTPUT).build() | ||
| private val serializer = GraphQLClientJacksonSerializer(testMapper) | ||
|
|
||
| private fun assertSerializedJsonEquals(expected: String, actual: String) { | ||
| // Check the contents rather than the string order | ||
| assertEquals(testMapper.readTree(expected), testMapper.readTree(actual)) | ||
| } | ||
|
|
||
|
Comment on lines
+46
to
+50
Collaborator
Author
There was a problem hiding this comment. The default ordering of the generated serialized objects changed https://github.com/FasterXML/jackson/blob/main/jackson3/MIGRATING_TO_JACKSON_3.md#changes-mapperfeature This test previously checked for exact equivalence, including ordering. It's sufficient to just check for functional equivalence. |
||
| @Test | ||
| fun `verify we can serialize GraphQLClientRequest`() { | ||
| val testQuery = FirstQuery(FirstQuery.Variables(input = 1.0f)) | ||
|
|
@@ -58,7 +62,7 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(testQuery) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -78,7 +82,7 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(queries) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -193,7 +197,7 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(scalarQuery) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -239,7 +243,7 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(query) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -276,7 +280,7 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(query) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -309,7 +313,7 @@ class GraphQLClientJacksonSerializerTest { | |
| |} | ||
| """.trimMargin() | ||
| val serialized = serializer.serialize(query) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -325,7 +329,7 @@ class GraphQLClientJacksonSerializerTest { | |
| |} | ||
| """.trimMargin() | ||
| val serialized = serializer.serialize(query) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -345,6 +349,6 @@ class GraphQLClientJacksonSerializerTest { | |
| """.trimMargin() | ||
|
|
||
| val serialized = serializer.serialize(entitiesQuery) | ||
| assertSerializedJsonEquals(expected, serialized) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ObjectMapper objects are now immutable, so we need to rebuild it to apply the settings that we need.