Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4249: AMQP: Configurable Header Mapping Order

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4249

Add `headersMappedLast` to outbound endpoints and channels.

* Fix typos in JavaDocs and `amqp.adoc`
This commit is contained in:
Gary Russell
2017-04-02 16:12:43 -04:00
committed by Artem Bilan
parent 2862c449c5
commit 6dbc721d73
22 changed files with 261 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/reference/asciidoc/amqp.adoc
View File

@@ -1140,6 +1140,22 @@ JSON converter to be selected.
This applies to both the outbound channel adapter and gateway.
NOTE
====
Starting with _version 5.0_, headers that are added to the `MessageProperties` of the outbound message are never overwritten by mapped headers (by default).
Previously, this was only the case if the message converter was a `ContentTypeDelegatingMessageConverter` (in that case, the header was mapped first, so that the proper converter could be selected).
For other converters, such as the `SimpleMessageConverter`, mapped headers overwrote any headers added by the converter.
This caused problems when an outbound message had some left over `contentType` header (perhaps from an inbound channel adapter) and the correct outbound `contentType` was incorrectly overwritten.
The work-around was to use a header filter to remove the header before sending the message to the outbound endpoint.
There are, however, cases where the previous behavior is desired.
For example, with a `String` payload containing JSON, the `SimpleMessageConverter` is not aware of the content and sets the `contentType` message property to `text/plain`, but your application would like to override that to `application/json` by setting the the `contentType` header of the message sent to the outbound endpoint.
The `ObjectToJsonTransformer` does exactly that (by default).
There is now a property on the outbound channel adapter and gateway (as well as AMQP-backed channels) `headersMappedLast`.
Setting this to `true` will restore the behavior of overwriting the property added by the converter.
====
[[amqp-user-id]]
=== Outbound User Id

4
src/reference/asciidoc/whats-new.adoc
View File

@@ -153,6 +153,10 @@ See <<amqp-inbound-channel-adapter>> for more information.
Pollable AMQP-backed channels now block the poller thread for the poller's configured `receiveTimeout` (default 1 second).
See <<amqp-channels>> for more information.
Headers, such as `contentType` that are added to message properties by the message converter are now used in the final message; previously, it depended on the converter type as to which headers/message properties appeared in the final message.
To override headers set by the converter, set the `headersMappedLast` property to `true`.
See <<content-type-conversion-outbound>> for more information.
==== HTTP Changes
The `DefaultHttpHeaderMapper.userDefinedHeaderPrefix` property is now an empty string by default instead of `X-`.