Skip to content

VERIFIY therepanic gh 1241 #1263

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

Closed
wants to merge 2 commits into from
Closed

VERIFIY therepanic gh 1241 #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56c6149
Allow dead letter topics to be non-fully-qualified.
therepanic Sep 20, 2025
eca7b86
Polish "Allow dead letter topics to be non-fully-qualified"
onobc Sep 21, 2025
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
20 changes: 20 additions & 0 deletions ...n/java/org/springframework/pulsar/reactive/core/DefaultReactivePulsarConsumerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Collections;
import java.util.List;
import java.util.function.Supplier;
import java.util.regex.Pattern;

import org.apache.pulsar.client.api.Schema;
Expand All @@ -27,6 +28,7 @@
import org.jspecify.annotations.Nullable;

import org.springframework.pulsar.core.PulsarTopicBuilder;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -101,6 +103,24 @@ protected void ensureTopicNamesFullyQualified(ReactiveMessageConsumerBuilder<T>
var fullyQualifiedTopics = topics.stream().map(this.topicBuilder::getFullyQualifiedNameForTopic).toList();
mutableSpec.setTopicNames(fullyQualifiedTopics);
}

if (mutableSpec.getDeadLetterPolicy() != null) {
var deadLetterPolicy = mutableSpec.getDeadLetterPolicy();
fullyQualifyDeadLetterPolicyTopic(deadLetterPolicy::getDeadLetterTopic,
deadLetterPolicy::setDeadLetterTopic);
fullyQualifyDeadLetterPolicyTopic(deadLetterPolicy::getRetryLetterTopic,
deadLetterPolicy::setRetryLetterTopic);
}
}

protected void fullyQualifyDeadLetterPolicyTopic(Supplier<String> topicGetter,
java.util.function.Consumer<String> topicSetter) {
Assert.notNull(this.topicBuilder, "topicBuilder must not be null");
var topicName = topicGetter.get();
if (StringUtils.hasText(topicName)) {
var fqTopicName = this.topicBuilder.getFullyQualifiedNameForTopic(topicName);
topicSetter.accept(fqTopicName);
}
}

protected void ensureTopicsPatternFullyQualified(ReactiveMessageConsumerBuilder<T> consumerBuilder) {
Expand Down
29 changes: 29 additions & 0 deletions ...a/org/springframework/pulsar/reactive/core/DefaultReactivePulsarConsumerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import java.util.List;
import java.util.regex.Pattern;

import org.apache.pulsar.client.api.DeadLetterPolicy;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.reactive.client.adapter.AdaptedReactivePulsarClientFactory;
import org.apache.pulsar.reactive.client.api.ReactiveMessageConsumer;
Expand Down Expand Up @@ -145,6 +147,33 @@ void createConsumerEnsureTopicsPatternFullyQualified() {
verify(topicBuilder).getFullyQualifiedNameForTopic(inputTopicsPattern);
}

@Test
void createConsumerEnsureDeadLetterPolicyTopicsFullyQualified() throws PulsarClientException {
var topicBuilder = spy(new PulsarTopicBuilder());
var consumerFactory = new DefaultReactivePulsarConsumerFactory<String>(
AdaptedReactivePulsarClientFactory.create((PulsarClient) null), null);
consumerFactory.setTopicBuilder(topicBuilder);
var deadLetterTopic = "with-topic-builder-reactive-ensure-dlp-dlt-fq";
var retryLetterTopic = "%s-retry".formatted(deadLetterTopic);
var deadLetterPolicy = DeadLetterPolicy.builder()
.maxRedeliverCount(2)
.deadLetterTopic(deadLetterTopic)
.retryLetterTopic(retryLetterTopic)
.build();
var consumer = consumerFactory.createConsumer(SCHEMA,
Collections.singletonList(builder -> builder.deadLetterPolicy(deadLetterPolicy)));
var reactiveMessageConsumerSpec = assertThat(consumer)
.extracting("consumerSpec", InstanceOfAssertFactories.type(ReactiveMessageConsumerSpec.class))
.actual();

assertThat(reactiveMessageConsumerSpec.getDeadLetterPolicy().getDeadLetterTopic())
.isEqualTo("persistent://public/default/%s".formatted(deadLetterTopic));
assertThat(reactiveMessageConsumerSpec.getDeadLetterPolicy().getRetryLetterTopic())
.isEqualTo("persistent://public/default/%s".formatted(retryLetterTopic));
verify(topicBuilder).getFullyQualifiedNameForTopic(deadLetterTopic);
verify(topicBuilder).getFullyQualifiedNameForTopic(retryLetterTopic);
}

}

}
20 changes: 20 additions & 0 deletions ...ng-pulsar/src/main/java/org/springframework/pulsar/core/DefaultPulsarConsumerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import java.util.function.Supplier;
import java.util.regex.Pattern;

import org.apache.pulsar.client.api.Consumer;
Expand All @@ -34,6 +35,7 @@
import org.jspecify.annotations.Nullable;

import org.springframework.pulsar.PulsarException;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -149,6 +151,24 @@ protected void ensureTopicNamesFullyQualified(ConsumerBuilder<T> builder) {
var fullyQualifiedTopics = topics.stream().map(this.topicBuilder::getFullyQualifiedNameForTopic).toList();
builderImpl.getConf().setTopicNames(new HashSet<>(fullyQualifiedTopics));
}

if (builderImpl.getConf().getDeadLetterPolicy() != null) {
var deadLetterPolicy = builderImpl.getConf().getDeadLetterPolicy();
fullyQualifyDeadLetterPolicyTopic(deadLetterPolicy::getDeadLetterTopic,
deadLetterPolicy::setDeadLetterTopic);
fullyQualifyDeadLetterPolicyTopic(deadLetterPolicy::getRetryLetterTopic,
deadLetterPolicy::setRetryLetterTopic);
}
}

protected void fullyQualifyDeadLetterPolicyTopic(Supplier<String> topicGetter,
java.util.function.Consumer<String> topicSetter) {
Assert.notNull(this.topicBuilder, "topicBuilder must not be null");
var topicName = topicGetter.get();
if (StringUtils.hasText(topicName)) {
var fqTopicName = this.topicBuilder.getFullyQualifiedNameForTopic(topicName);
topicSetter.accept(fqTopicName);
}
}

protected void ensureTopicsPatternFullyQualified(ConsumerBuilder<T> builder) {
Expand Down
33 changes: 30 additions & 3 deletions ...lsar/src/test/java/org/springframework/pulsar/core/DefaultPulsarConsumerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.ConsumerBuilder;
import org.apache.pulsar.client.api.DeadLetterPolicy;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.PulsarClientException.InvalidConfigurationException;
Expand Down Expand Up @@ -273,10 +274,10 @@ void multipleConfigCustomizers() throws PulsarClientException {
}

@Nested
class CreateConsumerUsingPulsarTopicBuilder {
class CreateConsumerWithTopicBuilder {

@Test
void withPulsarTopicBuilderEnsureTopicNamesFullyQualified() throws PulsarClientException {
void ensureTopicNamesFullyQualified() throws PulsarClientException {
var pulsarTopicBuilder = spy(new PulsarTopicBuilder());
DefaultPulsarConsumerFactory<String> consumerFactory = new DefaultPulsarConsumerFactory<>(pulsarClient,
null);
Expand All @@ -289,7 +290,7 @@ void withPulsarTopicBuilderEnsureTopicNamesFullyQualified() throws PulsarClientE
}

@Test
void withPulsarTopicBuilderEnsureTopicsPatternFullyQualified() throws PulsarClientException {
void ensureTopicsPatternFullyQualified() throws PulsarClientException {
var pulsarTopicBuilder = spy(new PulsarTopicBuilder());
ConsumerBuilderCustomizer<String> customizer = (builder) -> builder.topicsPattern("topic-.*");
DefaultPulsarConsumerFactory<String> consumerFactory = new DefaultPulsarConsumerFactory<>(pulsarClient,
Expand All @@ -307,6 +308,32 @@ void withPulsarTopicBuilderEnsureTopicsPatternFullyQualified() throws PulsarClie
}
}

@Test
void ensureDeadLetterPolicyTopicsFullyQualified() throws PulsarClientException {
var pulsarTopicBuilder = spy(new PulsarTopicBuilder());
var deadLetterTopic = "with-pulsar-topic-builder-ensure-dlp-dlt-fq";
var retryLetterTopic = "%s-retry".formatted(deadLetterTopic);
var deadLetterPolicy = DeadLetterPolicy.builder()
.maxRedeliverCount(2)
.deadLetterTopic(deadLetterTopic)
.retryLetterTopic(retryLetterTopic)
.build();
ConsumerBuilderCustomizer<String> customizer = (builder) -> builder.deadLetterPolicy(deadLetterPolicy);
DefaultPulsarConsumerFactory<String> consumerFactory = new DefaultPulsarConsumerFactory<>(pulsarClient,
List.of(customizer));
consumerFactory.setTopicBuilder(pulsarTopicBuilder);

try (Consumer<String> consumer = consumerFactory.createConsumer(SCHEMA, Collections.singletonList("topic1"),
"%s-sub".formatted(deadLetterTopic), null, null)) {
assertThat(consumer).extracting("deadLetterPolicy.deadLetterTopic")
.isEqualTo("persistent://public/default/%s".formatted(deadLetterTopic));
assertThat(consumer).extracting("deadLetterPolicy.retryLetterTopic")
.isEqualTo("persistent://public/default/%s".formatted(retryLetterTopic));
verify(pulsarTopicBuilder).getFullyQualifiedNameForTopic(deadLetterTopic);
verify(pulsarTopicBuilder).getFullyQualifiedNameForTopic(retryLetterTopic);
}
}

// TODO remove when Pulsar client updates to 4.2.0
private void temporarilyDealWithPulsar24698(PatternMultiTopicsConsumerImpl<String> consumer) {
// See https://github.com/apache/pulsar/pull/24698
Expand Down