Skip to content

Commit 1bc070e

Browse files
committed
WIP
1 parent dff52e1 commit 1bc070e

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/listener/ReactivePulsarContainerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class ReactivePulsarContainerProperties<T> {
7373
.fixedBackoff(Duration.ofSeconds(10))
7474
.build();
7575

76-
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.CONTINUE;
76+
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.STOP;
7777

7878
public ReactivePulsarMessageHandler getMessageHandler() {
7979
return this.messageHandler;

spring-pulsar/src/main/java/org/springframework/pulsar/listener/PulsarContainerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class PulsarContainerProperties {
108108
.fixedBackoff(Duration.ofSeconds(10))
109109
.build();
110110

111-
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.CONTINUE;
111+
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.STOP;
112112

113113
public PulsarContainerProperties(String... topics) {
114114
this.topics = Set.of(topics);

spring-pulsar/src/main/java/org/springframework/pulsar/reader/PulsarReaderContainerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class PulsarReaderContainerProperties {
6666
.fixedBackoff(Duration.ofSeconds(10))
6767
.build();
6868

69-
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.CONTINUE;
69+
private StartupFailurePolicy startupFailurePolicy = StartupFailurePolicy.STOP;
7070

7171
public Object getReaderListener() {
7272
return this.readerListener;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,9 @@ void batchListenerWithRecordAckModeNotSupported() {
431431
var consumerFactory = new DefaultPulsarConsumerFactory<String>(mock(PulsarClient.class), List.of());
432432
var container = new DefaultPulsarMessageListenerContainer<>(consumerFactory, containerProps);
433433
assertThatIllegalStateException().isThrownBy(() -> container.start())
434-
.withMessage("Transactional batch listeners do not support AckMode.RECORD");
434+
.withCauseInstanceOf(IllegalStateException.class)
435+
.havingRootCause()
436+
.withMessage("Transactional batch listeners do not support AckMode.RECORD");
435437
}
436438

437439
@Test

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ void recordListenerWithBatchAckNotSupported() {
248248
var consumerFactory = new DefaultPulsarConsumerFactory<String>(client, List.of());
249249
var container = new DefaultPulsarMessageListenerContainer<>(consumerFactory, containerProps);
250250
assertThatIllegalStateException().isThrownBy(() -> container.start())
251-
.withMessage("Transactional record listeners can not use batch ack mode");
251+
.withCauseInstanceOf(IllegalStateException.class)
252+
.havingRootCause()
253+
.withMessage("Transactional record listeners can not use batch ack mode");
252254
}
253255

254256
@Test
@@ -402,7 +404,7 @@ void txnBatchListenerWithErrorHandlerNotSupported() {
402404
var container = new DefaultPulsarMessageListenerContainer<>(consumerFactory, containerProps);
403405
container.setPulsarConsumerErrorHandler(mock(PulsarConsumerErrorHandler.class));
404406
assertThatIllegalStateException().isThrownBy(() -> container.start())
405-
.withMessage("Transactional batch listeners do not support custom error handlers");
407+
.withStackTraceContaining("Transactional batch listeners do not support custom error handlers");
406408
}
407409

408410
private Consumer<String> startContainerAndSendInputsThenWaitForLatch(String topicIn,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ void ignoresSettingWhenNoTxnManagerAvailable() {
322322
context.refresh();
323323
})
324324
.withCauseInstanceOf(IllegalStateException.class)
325-
.havingCause()
325+
.havingRootCause()
326326
.withMessage("Transactions are enabled but txn manager is not set");
327327
}
328328

0 commit comments

Comments
 (0)