From 4e4bcb1e039a39b1b2841c022267f1f1b0f9de03 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Mon, 28 Apr 2025 21:47:53 +0700 Subject: [PATCH] Add javadoc Antora property for Spring Retry * Fix small typos in the docs Signed-off-by: Tran Ngoc Nhan --- build.gradle | 1 + .../resilience-recovering-from-errors-and-broker-failures.adoc | 2 +- .../appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cb6c51f3..328958f5 100644 --- a/build.gradle +++ b/build.gradle @@ -754,6 +754,7 @@ def generateAttributes() { 'spring-retry-java-docs': "$springDocs/spring-retry/docs/$springRetryVersion/apidocs".toString(), 'javadoc-location-org-springframework-transaction': "$springDocs/spring-framework/docs/$springVersion/javadoc-api".toString(), 'javadoc-location-org-springframework-amqp': "$springDocs/spring-amqp/docs/$project.version/api".toString(), + 'javadoc-location-org-springframework-retry': "{spring-retry-java-docs}", 'micrometer-docs': "$micrometerDocsPrefix/micrometer/reference/${generateVersionWithoutPatch(micrometerVersion)}".toString(), 'micrometer-tracing-docs': "$micrometerDocsPrefix/tracing/reference/${generateVersionWithoutPatch(micrometerTracingVersion)}".toString() ] diff --git a/src/reference/antora/modules/ROOT/pages/amqp/resilience-recovering-from-errors-and-broker-failures.adoc b/src/reference/antora/modules/ROOT/pages/amqp/resilience-recovering-from-errors-and-broker-failures.adoc index fb35a972..ee68d852 100644 --- a/src/reference/antora/modules/ROOT/pages/amqp/resilience-recovering-from-errors-and-broker-failures.adoc +++ b/src/reference/antora/modules/ROOT/pages/amqp/resilience-recovering-from-errors-and-broker-failures.adoc @@ -55,7 +55,7 @@ You can do this manually, or you could look at using Spring Retry to handle the 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). 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. -See the Javadoc and properties of `StatefulRetryOperationsInterceptor` and `StatelessRetryOperationsInterceptor` for more detail. +See the Javadoc and properties of javadoc:org.springframework.retry.interceptor.StatefulRetryOperationsInterceptor[] and javadoc:org.springframework.retry.interceptor.RetryOperationsInterceptor[] for more detail. Stateless retry is appropriate if there is no transaction or if a transaction is started inside the retry callback. 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. A dropped connection in the middle of a transaction should have the same effect as a rollback. diff --git a/src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc b/src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc index fef889d8..aa39450c 100644 --- a/src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc +++ b/src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc @@ -67,7 +67,7 @@ See xref:amqp/receiving-messages/async-consumer.adoc#lc-auto-delete[`auto-delete [[rabbittemplate:-mandatory-and-connectionfactoryselector-expressions]] == `RabbitTemplate`: `mandatory` and `connectionFactorySelector` Expressions -The `mandatoryExpression`, `sendConnectionFactorySelectorExpression`, and `receiveConnectionFactorySelectorExpression` SpEL Expression`s properties have been added to `RabbitTemplate`. +The `mandatoryExpression`, `sendConnectionFactorySelectorExpression`, and `receiveConnectionFactorySelectorExpression` SpEL Expression properties have been added to `RabbitTemplate`. The `mandatoryExpression` is used to evaluate a `mandatory` boolean value against each request message when a `ReturnCallback` is in use. See xref:amqp/template.adoc#template-confirms[Correlated Publisher Confirms and Returns]. 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.