Skip to content

GH-10345: Replace Spring Retry in the JDBC module #10346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

GH-10345: Replace Spring Retry in the JDBC module #10346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions ...c/main/java/org/springframework/integration/jdbc/channel/PostgresSubscribableChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,24 @@

package org.springframework.integration.jdbc.channel;

import java.time.Duration;
import java.util.Optional;
import java.util.concurrent.Executor;

import org.jspecify.annotations.Nullable;

import org.springframework.core.log.LogAccessor;
import org.springframework.core.retry.RetryException;
import org.springframework.core.retry.RetryPolicy;
import org.springframework.core.retry.RetryTemplate;
import org.springframework.core.retry.Retryable;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.integration.channel.AbstractSubscribableChannel;
import org.springframework.integration.dispatcher.MessageDispatcher;
import org.springframework.integration.dispatcher.UnicastingDispatcher;
import org.springframework.integration.jdbc.store.JdbcChannelMessageStore;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.Assert;
Expand Down Expand Up @@ -69,7 +73,8 @@ public class PostgresSubscribableChannel extends AbstractSubscribableChannel

private @Nullable TransactionTemplate transactionTemplate;

private RetryTemplate retryTemplate = RetryTemplate.builder().maxAttempts(1).build();
private RetryTemplate retryTemplate =
new RetryTemplate(RetryPolicy.builder().maxAttempts(1).delay(Duration.ZERO).build());

private ErrorHandler errorHandler = ReflectionUtils::rethrowRuntimeException;

Expand Down Expand Up @@ -117,7 +122,7 @@ public void setTransactionManager(PlatformTransactionManager transactionManager)
}

/**
* Set the retry template to use for retries in case of exception in downstream processing
* Set the retry template to use it for retries in case of exception in downstream processing
* @param retryTemplate The retry template to use
* @since 6.0.5
* @see RetryTemplate
Expand Down Expand Up @@ -207,7 +212,7 @@ private Optional<?> doPollAndDispatchMessage() {
if (this.hasHandlers) {
TransactionTemplate transactionTemplateToUse = this.transactionTemplate;
if (transactionTemplateToUse != null) {
return this.retryTemplate.execute(context ->
return executeWithRetry(() ->
transactionTemplateToUse.execute(status ->
pollMessage()
.filter(message -> {
Expand All @@ -221,12 +226,26 @@ private Optional<?> doPollAndDispatchMessage() {
}
else {
return pollMessage()
.map(message -> this.retryTemplate.execute(context -> dispatch(message)));
.map(message -> executeWithRetry(() -> dispatch(message)));
}
}
return Optional.empty();
}

@SuppressWarnings("NullAway") // Never null, according to the logic in the 'doPollAndDispatchMessage()'.
private <T> T executeWithRetry(Retryable<T> retryable) {
try {
return this.retryTemplate.execute(retryable);
}
catch (RetryException ex) {
Throwable cause = ex.getCause();
if (cause instanceof RuntimeException runtimeException) {
throw runtimeException;
}
throw new IllegalStateException(cause);
}
}

private Optional<Message<?>> pollMessage() {
return Optional.ofNullable(this.jdbcChannelMessageStore.pollMessageFromGroup(this.groupId));
}
Expand Down
6 changes: 4 additions & 2 deletions ...springframework/integration/jdbc/postgres/PostgresChannelMessageTableSubscriberTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.retry.RetryPolicy;
import org.springframework.core.retry.RetryTemplate;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.jdbc.channel.PgConnectionSupplier;
import org.springframework.integration.jdbc.channel.PostgresChannelMessageTableSubscriber;
Expand All @@ -57,7 +59,6 @@
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
Expand Down Expand Up @@ -246,7 +247,8 @@ void testRetryOnErrorDuringDispatch(boolean transactionsEnabled) throws Interrup
AtomicInteger actualTries = new AtomicInteger();

int maxAttempts = 2;
postgresSubscribableChannel.setRetryTemplate(RetryTemplate.builder().maxAttempts(maxAttempts).build());
postgresSubscribableChannel.setRetryTemplate(
new RetryTemplate(RetryPolicy.builder().maxAttempts(maxAttempts).build()));

if (transactionsEnabled) {
postgresSubscribableChannel.setTransactionManager(transactionManager);
Expand Down