Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.springframework.boot.pulsar.autoconfigure.PulsarProperties.Defaults.SchemaInfo;
import org.springframework.boot.pulsar.autoconfigure.PulsarProperties.Defaults.TypeMapping;
import org.springframework.boot.thread.Threading;
import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizers;
import org.springframework.boot.util.LambdaSafe;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -80,6 +81,7 @@
* @author Alexander Preuß
* @author Phillip Webb
* @author Jonas Geiregat
* @author Yanming Zhou
* @since 4.0.0
*/
@AutoConfiguration
Expand Down Expand Up @@ -303,8 +305,11 @@ DefaultPulsarConsumerFactory<?> pulsarConsumerFactory(PulsarClient pulsarClient,
@Bean
@ConditionalOnMissingBean(PulsarAwareTransactionManager.class)
@ConditionalOnBooleanProperty("spring.pulsar.transaction.enabled")
PulsarTransactionManager pulsarTransactionManager(PulsarClient pulsarClient) {
return new PulsarTransactionManager(pulsarClient);
PulsarTransactionManager pulsarTransactionManager(PulsarClient pulsarClient,
ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
PulsarTransactionManager pulsarTransactionManager = new PulsarTransactionManager(pulsarClient);
transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize(pulsarTransactionManager));
return pulsarTransactionManager;
}

@SuppressWarnings("unchecked")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizationAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
Expand Down Expand Up @@ -78,7 +79,9 @@
import org.springframework.pulsar.function.PulsarFunctionAdministration;
import org.springframework.pulsar.listener.PulsarContainerProperties.TransactionSettings;
import org.springframework.pulsar.transaction.PulsarAwareTransactionManager;
import org.springframework.pulsar.transaction.PulsarTransactionManager;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.transaction.TransactionExecutionListener;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
Expand All @@ -92,6 +95,7 @@
* @author Alexander Preuß
* @author Soby Chacko
* @author Phillip Webb
* @author Yanming Zhou
*/
class PulsarAutoConfigurationTests {

Expand Down Expand Up @@ -173,6 +177,18 @@ void whenHasUserDefinedContainerFactoryCustomizersBeanDoesNotAutoConfigureBean()
.isSameAs(customizers));
}

@Test
void pulsarTransactionManagerWithTransactionExecutionListenersIsConfigured() {
TransactionExecutionListener listener = mock(TransactionExecutionListener.class);
this.contextRunner.withPropertyValues("spring.pulsar.transaction.enabled=true")
.withConfiguration(AutoConfigurations.of(TransactionManagerCustomizationAutoConfiguration.class))
.withBean(TransactionExecutionListener.class, () -> listener)
.run((context) -> {
PulsarTransactionManager transactionManager = context.getBean(PulsarTransactionManager.class);
assertThat(transactionManager.getTransactionExecutionListeners()).containsExactly(listener);
});
}

@Nested
class ClientTests {

Expand Down
Loading