Skip to content

Commit 2fbaa37

Browse files
committed
Add subscription name to Pulsar mapped config props
The subscription name config prop was not being set on the Pulsar listener container properties. This commit adds the subscription name to the Pulsar property mappers. Resolves #42053
1 parent fa686bb commit 2fbaa37

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ private void customizePulsarContainerConsumerSubscriptionProperties(PulsarContai
186186
PulsarProperties.Consumer.Subscription properties = this.properties.getConsumer().getSubscription();
187187
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
188188
map.from(properties::getType).to(containerProperties::setSubscriptionType);
189+
map.from(properties::getName).to(containerProperties::setSubscriptionName);
189190
}
190191

191192
private void customizePulsarContainerListenerProperties(PulsarContainerProperties containerProperties) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarReactivePropertiesMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private void customizePulsarContainerConsumerSubscriptionProperties(
8787
PulsarProperties.Consumer.Subscription properties = this.properties.getConsumer().getSubscription();
8888
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
8989
map.from(properties::getType).to(containerProperties::setSubscriptionType);
90+
map.from(properties::getName).to(containerProperties::setSubscriptionName);
9091
}
9192

9293
private void customizePulsarContainerListenerProperties(ReactivePulsarContainerProperties<?> containerProperties) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,14 @@ void customizeConsumerBuilder() {
256256
void customizeContainerProperties() {
257257
PulsarProperties properties = new PulsarProperties();
258258
properties.getConsumer().getSubscription().setType(SubscriptionType.Shared);
259+
properties.getConsumer().getSubscription().setName("my-subscription");
259260
properties.getListener().setSchemaType(SchemaType.AVRO);
260261
properties.getListener().setObservationEnabled(true);
261262
properties.getTransaction().setEnabled(true);
262263
PulsarContainerProperties containerProperties = new PulsarContainerProperties("my-topic-pattern");
263264
new PulsarPropertiesMapper(properties).customizeContainerProperties(containerProperties);
264265
assertThat(containerProperties.getSubscriptionType()).isEqualTo(SubscriptionType.Shared);
266+
assertThat(containerProperties.getSubscriptionName()).isEqualTo("my-subscription");
265267
assertThat(containerProperties.getSchemaType()).isEqualTo(SchemaType.AVRO);
266268
assertThat(containerProperties.isObservationEnabled()).isTrue();
267269
assertThat(containerProperties.transactions().isEnabled()).isTrue();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarReactivePropertiesMapperTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,12 @@ void customizeMessageConsumerBuilder() {
119119
void customizeContainerProperties() {
120120
PulsarProperties properties = new PulsarProperties();
121121
properties.getConsumer().getSubscription().setType(SubscriptionType.Shared);
122+
properties.getConsumer().getSubscription().setName("my-subscription");
122123
properties.getListener().setSchemaType(SchemaType.AVRO);
123124
ReactivePulsarContainerProperties<Object> containerProperties = new ReactivePulsarContainerProperties<>();
124125
new PulsarReactivePropertiesMapper(properties).customizeContainerProperties(containerProperties);
125126
assertThat(containerProperties.getSubscriptionType()).isEqualTo(SubscriptionType.Shared);
127+
assertThat(containerProperties.getSubscriptionName()).isEqualTo("my-subscription");
126128
assertThat(containerProperties.getSchemaType()).isEqualTo(SchemaType.AVRO);
127129
}
128130

0 commit comments

Comments
 (0)