Skip to content

Commit 62ef81b

Browse files
onobcwilkinsona
authored andcommitted
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. See gh-42067
1 parent f024c19 commit 62ef81b

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
@@ -190,6 +190,7 @@ private void customizePulsarContainerConsumerSubscriptionProperties(PulsarContai
190190
PulsarProperties.Consumer.Subscription properties = this.properties.getConsumer().getSubscription();
191191
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
192192
map.from(properties::getType).to(containerProperties::setSubscriptionType);
193+
map.from(properties::getName).to(containerProperties::setSubscriptionName);
193194
}
194195

195196
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
@@ -88,6 +88,7 @@ private void customizePulsarContainerConsumerSubscriptionProperties(
8888
PulsarProperties.Consumer.Subscription properties = this.properties.getConsumer().getSubscription();
8989
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
9090
map.from(properties::getType).to(containerProperties::setSubscriptionType);
91+
map.from(properties::getName).to(containerProperties::setSubscriptionName);
9192
}
9293

9394
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
@@ -262,12 +262,14 @@ void customizeConsumerBuilder() {
262262
void customizeContainerProperties() {
263263
PulsarProperties properties = new PulsarProperties();
264264
properties.getConsumer().getSubscription().setType(SubscriptionType.Shared);
265+
properties.getConsumer().getSubscription().setName("my-subscription");
265266
properties.getListener().setSchemaType(SchemaType.AVRO);
266267
properties.getListener().setObservationEnabled(true);
267268
properties.getTransaction().setEnabled(true);
268269
PulsarContainerProperties containerProperties = new PulsarContainerProperties("my-topic-pattern");
269270
new PulsarPropertiesMapper(properties).customizeContainerProperties(containerProperties);
270271
assertThat(containerProperties.getSubscriptionType()).isEqualTo(SubscriptionType.Shared);
272+
assertThat(containerProperties.getSubscriptionName()).isEqualTo("my-subscription");
271273
assertThat(containerProperties.getSchemaType()).isEqualTo(SchemaType.AVRO);
272274
assertThat(containerProperties.isObservationEnabled()).isTrue();
273275
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
@@ -120,11 +120,13 @@ void customizeMessageConsumerBuilder() {
120120
void customizeContainerProperties() {
121121
PulsarProperties properties = new PulsarProperties();
122122
properties.getConsumer().getSubscription().setType(SubscriptionType.Shared);
123+
properties.getConsumer().getSubscription().setName("my-subscription");
123124
properties.getListener().setSchemaType(SchemaType.AVRO);
124125
properties.getListener().setConcurrency(10);
125126
ReactivePulsarContainerProperties<Object> containerProperties = new ReactivePulsarContainerProperties<>();
126127
new PulsarReactivePropertiesMapper(properties).customizeContainerProperties(containerProperties);
127128
assertThat(containerProperties.getSubscriptionType()).isEqualTo(SubscriptionType.Shared);
129+
assertThat(containerProperties.getSubscriptionName()).isEqualTo("my-subscription");
128130
assertThat(containerProperties.getSchemaType()).isEqualTo(SchemaType.AVRO);
129131
assertThat(containerProperties.getConcurrency()).isEqualTo(10);
130132
}

0 commit comments

Comments
 (0)