Populate a JsonHeaders.RESOLVABLE_TYPE on reply #3163
Merged
Conversation
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
Fixes spring-projects/spring-integration-samples#277 In the `AbstractAmqpOutboundEndpoint` the `JsonHeaders.RESOLVABLE_TYPE` from request message is copied to reply message making inconsistency downstream. The `JsonToObjectTransformer` consults first a `JsonHeaders.RESOLVABLE_TYPE` and deserialize payload to wrong type * Fix `DefaultAmqpHeaderMapper` to populate a `JsonHeaders.RESOLVABLE_TYPE` alongside with other `JsonHeaders` populated from the reply AMQP message. This way a `JsonHeaders.RESOLVABLE_TYPE` from request message won't have effect * To get access to classes, supply `AbstractHeaderMapper` with a bean factory `ClassLoader` * Introduce a couple utility methods into `JsonHeaders` for building a `ResolvableType` **Cherry-pick to 5.2.x**
garyrussell
suggested changes
Jan 31, 2020
...amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
Outdated
Show resolved
Hide resolved
garyrussell
approved these changes
Jan 31, 2020
Contributor
|
Cherry-picked to 5.2.x as 75476bd |
garyrussell
pushed a commit
that referenced
this pull request
Jan 31, 2020
* Populate a JsonHeaders.RESOLVABLE_TYPE on reply Fixes spring-projects/spring-integration-samples#277 In the `AbstractAmqpOutboundEndpoint` the `JsonHeaders.RESOLVABLE_TYPE` from request message is copied to reply message making inconsistency downstream. The `JsonToObjectTransformer` consults first a `JsonHeaders.RESOLVABLE_TYPE` and deserialize payload to wrong type * Fix `DefaultAmqpHeaderMapper` to populate a `JsonHeaders.RESOLVABLE_TYPE` alongside with other `JsonHeaders` populated from the reply AMQP message. This way a `JsonHeaders.RESOLVABLE_TYPE` from request message won't have effect * To get access to classes, supply `AbstractHeaderMapper` with a bean factory `ClassLoader` * Introduce a couple utility methods into `JsonHeaders` for building a `ResolvableType` **Cherry-pick to 5.2.x** * * Fix code formatting for arguments wrapping
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes spring-projects/spring-integration-samples#277
In the
AbstractAmqpOutboundEndpointtheJsonHeaders.RESOLVABLE_TYPEfrom request message is copied to reply message making inconsistency downstream.
The
JsonToObjectTransformerconsults first aJsonHeaders.RESOLVABLE_TYPEand deserialize payload to wrong type
DefaultAmqpHeaderMapperto populate aJsonHeaders.RESOLVABLE_TYPEalongside with other
JsonHeaderspopulated from the reply AMQP message.This way a
JsonHeaders.RESOLVABLE_TYPEfrom request message won't have effectAbstractHeaderMapperwith a bean factoryClassLoaderJsonHeadersfor building aResolvableTypeCherry-pick to 5.2.x