Skip to content

Ensure default topics are fully qualified #849

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 2 commits into from
Sep 13, 2024
Merged

Ensure default topics are fully qualified #849

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
0f6136f
Ensure default topics are fully qualified
onobc Sep 13, 2024
bd6f54c
Fix format
onobc Sep 13, 2024
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
5 changes: 3 additions & 2 deletions ...Test/java/org/springframework/pulsar/inttest/listener/PulsarListenerIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022-2023 the original author or authors.
* Copyright 2022-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -160,7 +160,8 @@ static class ConfigPropsDrivenListenerConfig {
public void listen(String ignored, Consumer<String> consumer) {
assertThat(consumer).extracting("conf", InstanceOfAssertFactories.type(ConsumerConfigurationData.class))
.satisfies((conf) -> {
assertThat(conf.getSingleTopic()).isEqualTo("plit-config-props-topic-dev");
assertThat(conf.getSingleTopic())
.isEqualTo("persistent://public/default/plit-config-props-topic-dev");
assertThat(conf.getSubscriptionType()).isEqualTo(SubscriptionType.Shared);
assertThat(conf.getSubscriptionName()).isEqualTo("plit-config-props-subs-dev");
});
Expand Down
18 changes: 14 additions & 4 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 @@ -101,10 +101,11 @@ public Consumer<T> createConsumer(Schema<T> schema, @Nullable Collection<String>
Objects.requireNonNull(schema, "Schema must be specified");
ConsumerBuilder<T> consumerBuilder = this.pulsarClient.newConsumer(schema);

// Apply the default config customizer (preserve the topic)
// Apply the default config customizer
if (!CollectionUtils.isEmpty(this.defaultConfigCustomizers)) {
this.defaultConfigCustomizers.forEach((customizer -> customizer.customize(consumerBuilder)));
}
// Preserve the passed in topics (don't let default config customizer win)
if (topics != null) {
replaceTopicsOnBuilder(consumerBuilder, topics);
}
Expand All @@ -117,6 +118,9 @@ public Consumer<T> createConsumer(Schema<T> schema, @Nullable Collection<String>
if (!CollectionUtils.isEmpty(customizers)) {
customizers.forEach(customizer -> customizer.customize(consumerBuilder));
}
if (this.topicBuilder != null) {
this.ensureTopicNamesFullyQualified(consumerBuilder);
}
try {
return consumerBuilder.subscribe();
}
Expand All @@ -126,9 +130,6 @@ public Consumer<T> createConsumer(Schema<T> schema, @Nullable Collection<String>
}

private void replaceTopicsOnBuilder(ConsumerBuilder<T> builder, Collection<String> topics) {
if (this.topicBuilder != null) {
topics = topics.stream().map(this.topicBuilder::getFullyQualifiedNameForTopic).toList();
}
var builderImpl = (ConsumerBuilderImpl<T>) builder;
builderImpl.getConf().setTopicNames(new HashSet<>(topics));
}
Expand All @@ -139,4 +140,13 @@ private void replaceMetadataPropertiesOnBuilder(ConsumerBuilder<T> builder,
builderImpl.getConf().setProperties(new TreeMap<>(metadataProperties));
}

protected void ensureTopicNamesFullyQualified(ConsumerBuilder<T> builder) {
var builderImpl = (ConsumerBuilderImpl<T>) builder;
var topics = builderImpl.getConf().getTopicNames();
if (!CollectionUtils.isEmpty(topics)) {
var fullyQualifiedTopics = topics.stream().map(this.topicBuilder::getFullyQualifiedNameForTopic).toList();
builderImpl.getConf().setTopicNames(new HashSet<>(fullyQualifiedTopics));
}
}

}