Skip to content

Commit c5ed26d

Browse files
committed
Move test customizer to TopLevelConfig in txn tests
Signed-off-by: onobc <[email protected]>
1 parent e39d011 commit c5ed26d

File tree

3 files changed

+13
-52
lines changed

3 files changed

+13
-52
lines changed

spring-pulsar/src/test/java/org/springframework/pulsar/listener/PulsarListenerTxnTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.springframework.pulsar.listener.PulsarListenerTxnTests.ListenerWithExternalTransactionRollback.ListenerWithExternalTransactionRollbackConfig;
4242
import org.springframework.pulsar.listener.PulsarListenerTxnTests.RecordListenerWithCommit.RecordListenerWithCommitConfig;
4343
import org.springframework.pulsar.listener.PulsarListenerTxnTests.RecordListenerWithRollback.RecordListenerWithRollbackConfig;
44-
import org.springframework.pulsar.listener.PulsarTxnTestsBase.TestPulsarContainerPropertiesCustomizer;
4544
import org.springframework.pulsar.transaction.PulsarTxnTestsBase;
4645
import org.springframework.test.context.ContextConfiguration;
4746
import org.springframework.transaction.annotation.Transactional;

spring-pulsar/src/test/java/org/springframework/pulsar/listener/PulsarTxnTestsBase.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

spring-pulsar/src/test/java/org/springframework/pulsar/transaction/PulsarTxnTestsBase.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.pulsar.client.api.Schema;
2828
import org.assertj.core.api.AbstractListAssert;
2929
import org.assertj.core.api.ObjectAssert;
30+
import org.jspecify.annotations.Nullable;
3031
import org.junit.jupiter.api.BeforeAll;
3132
import org.testcontainers.containers.PulsarContainer;
3233
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -103,6 +104,13 @@ protected AbstractListAssert<?, List<? extends String>, String, ObjectAssert<Str
103104
.get()).map(Message::getValue);
104105
}
105106

107+
@FunctionalInterface
108+
public interface TestPulsarContainerPropertiesCustomizer {
109+
110+
void customize(PulsarContainerProperties containerProps);
111+
112+
}
113+
106114
@Configuration
107115
@EnablePulsar
108116
public static class TopLevelConfig {
@@ -135,11 +143,15 @@ public PulsarConsumerFactory<?> pulsarConsumerFactory(PulsarClient pulsarClient,
135143
}
136144

137145
@Bean
138-
PulsarContainerProperties pulsarContainerProperties(PulsarAwareTransactionManager pulsarTransactionManager) {
146+
PulsarContainerProperties pulsarContainerProperties(PulsarAwareTransactionManager pulsarTransactionManager,
147+
@Nullable TestPulsarContainerPropertiesCustomizer containerPropsCustomizer) {
139148
var containerProps = new PulsarContainerProperties();
140149
containerProps.transactions().setEnabled(true);
141150
containerProps.transactions().setRequired(false);
142151
containerProps.transactions().setTransactionManager(pulsarTransactionManager);
152+
if (containerPropsCustomizer != null) {
153+
containerPropsCustomizer.customize(containerProps);
154+
}
143155
return containerProps;
144156
}
145157

0 commit comments

Comments
 (0)