Skip to content

Commit 4e4bcb1

Browse files
Add javadoc Antora property for Spring Retry
* Fix small typos in the docs Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent 40f1424 commit 4e4bcb1

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ def generateAttributes() {
754754
'spring-retry-java-docs': "$springDocs/spring-retry/docs/$springRetryVersion/apidocs".toString(),
755755
'javadoc-location-org-springframework-transaction': "$springDocs/spring-framework/docs/$springVersion/javadoc-api".toString(),
756756
'javadoc-location-org-springframework-amqp': "$springDocs/spring-amqp/docs/$project.version/api".toString(),
757+
'javadoc-location-org-springframework-retry': "{spring-retry-java-docs}",
757758
'micrometer-docs': "$micrometerDocsPrefix/micrometer/reference/${generateVersionWithoutPatch(micrometerVersion)}".toString(),
758759
'micrometer-tracing-docs': "$micrometerDocsPrefix/tracing/reference/${generateVersionWithoutPatch(micrometerTracingVersion)}".toString()
759760
]

src/reference/antora/modules/ROOT/pages/amqp/resilience-recovering-from-errors-and-broker-failures.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You can do this manually, or you could look at using Spring Retry to handle the
5555

5656
Spring Retry provides a couple of AOP interceptors and a great deal of flexibility to specify the parameters of the retry (number of attempts, exception types, backoff algorithm, and others).
5757
Spring AMQP also provides some convenience factory beans for creating Spring Retry interceptors in a convenient form for AMQP use cases, with strongly typed callback interfaces that you can use to implement custom recovery logic.
58-
See the Javadoc and properties of `StatefulRetryOperationsInterceptor` and `StatelessRetryOperationsInterceptor` for more detail.
58+
See the Javadoc and properties of javadoc:org.springframework.retry.interceptor.StatefulRetryOperationsInterceptor[] and javadoc:org.springframework.retry.interceptor.RetryOperationsInterceptor[] for more detail.
5959
Stateless retry is appropriate if there is no transaction or if a transaction is started inside the retry callback.
6060
Note that stateless retry is simpler to configure and analyze than stateful retry, but it is not usually appropriate if there is an ongoing transaction that must be rolled back or definitely is going to roll back.
6161
A dropped connection in the middle of a transaction should have the same effect as a rollback.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ See xref:amqp/receiving-messages/async-consumer.adoc#lc-auto-delete[`auto-delete
6767
[[rabbittemplate:-mandatory-and-connectionfactoryselector-expressions]]
6868
== `RabbitTemplate`: `mandatory` and `connectionFactorySelector` Expressions
6969

70-
The `mandatoryExpression`, `sendConnectionFactorySelectorExpression`, and `receiveConnectionFactorySelectorExpression` SpEL Expression`s properties have been added to `RabbitTemplate`.
70+
The `mandatoryExpression`, `sendConnectionFactorySelectorExpression`, and `receiveConnectionFactorySelectorExpression` SpEL Expression properties have been added to `RabbitTemplate`.
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.

0 commit comments

Comments
 (0)