Skip to content

Commit f1a0a06

Browse files
committed
Fix some typos in amqp.adoc
1 parent bff891b commit f1a0a06

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

src/reference/asciidoc/amqp.adoc

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ In general, use one consumer for low-volume queues.
106106
Not allowed when 'consumers-per-queue' is set.
107107
Optional.
108108
<8> Bean reference to the RabbitMQ `ConnectionFactory`.
109-
Optional (defaults to 'connectionFactory').
109+
Optional (defaults to `connectionFactory`).
110110
<9> Message channel to which error messages should be sent.
111111
Optional.
112112
<10> Whether the listener channel (com.rabbitmq.client.Channel) is exposed to a registered `ChannelAwareMessageListener`.
@@ -744,7 +744,7 @@ The following listing shows the possible properties for an AMQP Outbound Gateway
744744
====
745745
[source,xml]
746746
----
747-
<int-amqp:outbound-gateway id="outboundGateway" <1>
747+
<int-amqp:outbound-gateway id="outboundGateway" <1>
748748
request-channel="myRequestChannel" <2>
749749
amqp-template="" <3>
750750
exchange-name="" <4>
@@ -958,24 +958,24 @@ The following listing shows the possible configuration options for an AMQP async
958958
====
959959
[source,xml]
960960
----
961-
<int-amqp:outbound-async-gateway id="asyncOutboundGateway" <1>
961+
<int-amqp:outbound-async-gateway id="asyncOutboundGateway" <1>
962962
request-channel="myRequestChannel" <2>
963-
async-template="" <3>
964-
exchange-name="" <4>
965-
exchange-name-expression="" <5>
966-
order="1" <6>
967-
reply-channel="" <7>
968-
reply-timeout="" <8>
969-
requires-reply="" <9>
970-
routing-key="" <10>
971-
routing-key-expression="" <11>
972-
default-delivery-mode"" <12>
973-
confirm-correlation-expression="" <13>
974-
confirm-ack-channel="" <14>
975-
confirm-nack-channel="" <15>
976-
confirm-timeout="" <16>
977-
return-channel="" <17>
978-
lazy-connect="true" /> <18>
963+
async-template="" <3>
964+
exchange-name="" <4>
965+
exchange-name-expression="" <5>
966+
order="1" <6>
967+
reply-channel="" <7>
968+
reply-timeout="" <8>
969+
requires-reply="" <9>
970+
routing-key="" <10>
971+
routing-key-expression="" <11>
972+
default-delivery-mode"" <12>
973+
confirm-correlation-expression="" <13>
974+
confirm-ack-channel="" <14>
975+
confirm-nack-channel="" <15>
976+
confirm-timeout="" <16>
977+
return-channel="" <17>
978+
lazy-connect="true" /> <18>
979979
980980
----
981981
@@ -1395,13 +1395,12 @@ See the <<header-copy-caution,caution>> that appears later in this section for w
13951395
To override the default and revert to the pre-4.3 behavior, use `STANDARD_REQUEST_HEADERS` and
13961396
`STANDARD_REPLY_HEADERS` in the properties.
13971397

1398-
TIP: When mapping user-defined headers, the values can also contain simple wildcard patterns (such as `thing*` or `*thing`) to be matched.
1399-
`*` matches all headers.
1398+
TIP: When mapping user-defined headers, the values can also contain simple wildcard patterns (such as `thing*` or `\*thing`) to be matched.
1399+
The `*` matches all headers.
14001400

14011401
Starting with version 4.1, the `AbstractHeaderMapper` (a `DefaultAmqpHeaderMapper` superclass) lets the `NON_STANDARD_HEADERS` token be configured for the `requestHeaderNames` and `replyHeaderNames` properties (in addition to the existing `STANDARD_REQUEST_HEADERS` and `STANDARD_REPLY_HEADERS`) to map all user-defined headers.
14021402

1403-
The `org.springframework.amqp.support.AmqpHeaders` class identifies the default headers that are used by the
1404-
`DefaultAmqpHeaderMapper`:
1403+
The `org.springframework.amqp.support.AmqpHeaders` class identifies the default headers that are used by the `DefaultAmqpHeaderMapper`:
14051404

14061405
* `amqp_appId`
14071406
* `amqp_clusterId`
@@ -1435,7 +1434,7 @@ The `org.springframework.amqp.support.AmqpHeaders` class identifies the default
14351434
* `amqp_consumerQueue`
14361435

14371436
[[header-copy-caution]]
1438-
CAUTION: As mentioned earlier in this section, using a header mapping pattern of`*` is a common way to copy all headers.
1437+
CAUTION: As mentioned earlier in this section, using a header mapping pattern of `\*` is a common way to copy all headers.
14391438
However, this can have some unexpected side effects, because certain RabbitMQ proprietary properties/headers are also copied.
14401439
For example, when you use https://www.rabbitmq.com/federated-exchanges.html[federation], the received message may have a property named `x-received-from`, which contains the node that sent the message.
14411440
If you use the wildcard character `*` for the request and reply header mapping on the inbound gateway, this header is copied, which may cause some issues with federation.
@@ -1456,7 +1455,7 @@ For this purpose a `!json_*` pattern should be configured for header mapper of t
14561455
IMPORTANT: If you have a user-defined header that begins with `!` that you do wish to map, you need to escape it with `\`, as follows: `STANDARD_REQUEST_HEADERS,\!myBangHeader`.
14571456
The header named `!myBangHeader` is now mapped.
14581457

1459-
NOTE: Starting with _version 5.1_, the `DefaultAmqpHeaderMapper` will fall back to mapping `MessageHeaders.ID` and `MessageHeaders.TIMESTAMP` to `MessageProperties.messageId` and `MessageProperties.timestamp` respectively, if the corresponding `amqp_messageId` or `amqp_timestamp` headers are not present on outbound messages.
1458+
NOTE: Starting with version 5.1, the `DefaultAmqpHeaderMapper` will fall back to mapping `MessageHeaders.ID` and `MessageHeaders.TIMESTAMP` to `MessageProperties.messageId` and `MessageProperties.timestamp` respectively, if the corresponding `amqp_messageId` or `amqp_timestamp` headers are not present on outbound messages.
14601459
Inbound properties will be mapped to the `amqp_*` headers as before.
14611460
It is useful to populate the `messageId` property when message consumers are using stateful retry.
14621461

0 commit comments

Comments
 (0)