Skip to content

Commit 17fb186

Browse files
authored
Merge branch 'spring-projects:main' into 2814-add-opentelemetry-tags-rabbitmq-rabbittemplate
2 parents 7e4264b + b4339b3 commit 17fb186

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

src/reference/antora/antora.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ asciidoc:
2525
micrometer-docs: 'https://docs.micrometer.io'
2626
micrometer-tracing-docs: '{micrometer-docs}/tracing/reference/'
2727
micrometer-micrometer-docs: '{micrometer-docs}/micrometer/reference/'
28-
rabbitmq-stream-docs: 'https://rabbitmq.github.io/rabbitmq-stream-java-client/stable/htmlsingle'
28+
rabbitmq-stream-docs: 'https://rabbitmq.github.io/rabbitmq-stream-java-client/stable/htmlsingle'
29+
rabbitmq-github: 'https://github.com/rabbitmq'
30+
rabbitmq-server-github: '{rabbitmq-github}/rabbitmq-server/tree/main/deps'

src/reference/antora/modules/ROOT/pages/amqp/abstractions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Starting with version 3.2, the `ConsistentHashExchange` type has been introduced
9393
It provided options like `x-consistent-hash` for an exchange type.
9494
Allows to configure `hash-header` or `hash-property` exchange definition argument.
9595
The respective RabbitMQ `rabbitmq_consistent_hash_exchange` plugin has to be enabled on the broker.
96-
More information about the purpose, logic and behavior of the Consistent Hash Exchange are in the official RabbitMQ https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_consistent_hash_exchange[documentation].
96+
More information about the purpose, logic and behavior of the Consistent Hash Exchange are in the official RabbitMQ {rabbitmq-server-github}/rabbitmq_consistent_hash_exchange[documentation].
9797

9898
NOTE: The AMQP specification also requires that any broker provide a "`default`" direct exchange that has no name.
9999
All queues that are declared are bound to that default `Exchange` with their names as routing keys.

src/reference/antora/modules/ROOT/pages/amqp/connections.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ Starting with version 3.0, the underlying connection factory will attempt to con
429429
To revert to the previous behavior of attempting to connect from first to last, set the `addressShuffleMode` property to `AddressShuffleMode.NONE`.
430430

431431
Starting with version 2.3, the `INORDER` shuffle mode was added, which means the first address is moved to the end after a connection is created.
432-
You may wish to use this mode with the https://github.com/rabbitmq/rabbitmq-sharding[RabbitMQ Sharding Plugin] with `CacheMode.CONNECTION` and suitable concurrency if you wish to consume from all shards on all nodes.
432+
You may wish to use this mode with the {rabbitmq-server-github}/rabbitmq_sharding[RabbitMQ Sharding Plugin] with `CacheMode.CONNECTION` and suitable concurrency if you wish to consume from all shards on all nodes.
433433

434434
[source, java]
435435
----

src/reference/antora/modules/ROOT/pages/amqp/containerAttributes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ a|
250250
|[[consumeDelay]]<<consumeDelay,`consumeDelay`>> +
251251
(N/A)
252252

253-
|When using the https://github.com/rabbitmq/rabbitmq-sharding[RabbitMQ Sharding Plugin] with `concurrentConsumers > 1`, there is a race condition that can prevent even distribution of the consumers across the shards.
253+
|When using the {rabbitmq-server-github}/rabbitmq_sharding[RabbitMQ Sharding Plugin] with `concurrentConsumers > 1`, there is a race condition that can prevent even distribution of the consumers across the shards.
254254
Use this property to add a small delay between consumer starts to avoid this race condition.
255255
You should experiment with values to determine the suitable delay for your environment.
256256

src/reference/antora/modules/ROOT/pages/amqp/management-rest-api.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:page-section-summary-toc: 1
44

55
When the management plugin is enabled, the RabbitMQ server exposes a REST API to monitor and configure the broker.
6-
A https://github.com/rabbitmq/hop[Java Binding for the API] is now provided.
6+
A {rabbitmq-github}/hop[Java Binding for the API] is now provided.
77
The `com.rabbitmq.http.client.Client` is a standard, immediate, and, therefore, blocking API.
88
It is based on the {spring-framework-docs}/web.html[Spring Web] module and its `RestTemplate` implementation.
99
On the other hand, the `com.rabbitmq.http.client.ReactorNettyClient` is a reactive, non-blocking implementation based on the https://projectreactor.io/docs/netty/release/reference/docs/index.html[Reactor Netty] project.

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-3-since-1-2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ See xref:amqp/broker-configuration.adoc#headers-exchange[Headers Exchange].
7070

7171
A new `SimpleRoutingConnectionFactory` has been introduced.
7272
It allows configuration of `ConnectionFactories` mapping, to determine the target `ConnectionFactory` to use at runtime.
73-
See xref:amqp/connections.adoc#routing-connection-factory[routing-connection-factory].
73+
See xref:amqp/connections.adoc#routing-connection-factory[Routing Connection Factory].
7474

7575
[[messagebuilder-and-messagepropertiesbuilder]]
7676
== `MessageBuilder` and `MessagePropertiesBuilder`

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ The `mandatoryExpression`, `sendConnectionFactorySelectorExpression`, and `recei
7171
The `mandatoryExpression` is used to evaluate a `mandatory` boolean value against each request message when a `ReturnCallback` is in use.
7272
See xref:amqp/template.adoc#template-confirms[Correlated Publisher Confirms and Returns].
7373
The `sendConnectionFactorySelectorExpression` and `receiveConnectionFactorySelectorExpression` are used when an `AbstractRoutingConnectionFactory` is provided, to determine the `lookupKey` for the target `ConnectionFactory` at runtime on each AMQP protocol interaction operation.
74-
See xref:amqp/connections.adoc#routing-connection-factory[routing-connection-factory].
74+
See xref:amqp/connections.adoc#routing-connection-factory[Routing Connection Factory].
7575

7676
[[listeners-and-the-routing-connection-factory]]
7777
== Listeners and the Routing Connection Factory
7878

7979
You can configure a `SimpleMessageListenerContainer` with a routing connection factory to enable connection selection based on the queue names.
80-
See xref:amqp/connections.adoc#routing-connection-factory[routing-connection-factory].
80+
See xref:amqp/connections.adoc#routing-connection-factory[Routing Connection Factory].
8181

8282
[[rabbittemplate:-recoverycallback-option]]
8383
== `RabbitTemplate`: `RecoveryCallback` Option

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-2-3-since-2-2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ See xref:amqp/request-reply.adoc#direct-reply-to[RabbitMQ Direct reply-to] for m
4343
[[listener-container-changes]]
4444
== Listener Container Changes
4545

46-
A new listener container property `consumeDelay` is now available; it is helpful when using the https://github.com/rabbitmq/rabbitmq-sharding[RabbitMQ Sharding Plugin].
46+
A new listener container property `consumeDelay` is now available; it is helpful when using the {rabbitmq-server-github}/rabbitmq_sharding[RabbitMQ Sharding Plugin].
4747

4848
The default `JavaLangErrorHandler` now calls `System.exit(99)`.
4949
To revert to the previous behavior (do nothing), add a no-op handler.

src/reference/antora/modules/ROOT/pages/stream.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[stream-support]]
22
= Using the RabbitMQ Stream Plugin
33

4-
Version 2.4 introduces initial support for the https://github.com/rabbitmq/rabbitmq-stream-java-client[RabbitMQ Stream Plugin Java Client] for the https://rabbitmq.com/stream.html[RabbitMQ Stream Plugin].
4+
Version 2.4 introduces initial support for the {rabbitmq-github}/rabbitmq-stream-java-client[RabbitMQ Stream Plugin Java Client] for the https://rabbitmq.com/stream.html[RabbitMQ Stream Plugin].
55

66
* `RabbitStreamTemplate`
77
* `StreamListenerContainer`

0 commit comments

Comments
 (0)