Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve property defaults

Browse Source 
See gh-41851
This commit is contained in:
Andy Wilkinson
2024-08-20 11:21:26 +01:00
parent df893518cb
commit a70ff35dba
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarProperties.java
View File

@@ -311,17 +311,15 @@ public class PulsarProperties {
/**
* Default tenant to use when producing or consuming messages against a
* non-fully-qualified topic URL. When not specified Pulsar uses a default
* tenant of 'public'.
* non-fully-qualified topic URL.
*/
private String tenant;
private String tenant = "public";
/**
* Default namespace to use when producing or consuming messages against a
* non-fully-qualified topic URL. When not specified Pulsar uses a default
* namespace of 'default'.
* non-fully-qualified topic URL.
*/
private String namespace;
private String namespace = "default";
public String getTenant() {
return this.tenant;

9
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesTests.java
View File

@@ -30,6 +30,7 @@ import org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.api.SubscriptionMode;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.schema.SchemaType;
import org.assertj.core.extractor.Extractors;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -40,6 +41,7 @@ import org.springframework.boot.autoconfigure.pulsar.PulsarProperties.Failover.B
import org.springframework.boot.context.properties.bind.BindException;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
import org.springframework.pulsar.core.PulsarTopicBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -247,9 +249,12 @@ class PulsarPropertiesTests {
@Test
void bindWhenValuesNotSpecified() {
PulsarTopicBuilder defaultTopicBuilder = new PulsarTopicBuilder();
assertThat(new PulsarProperties().getDefaults().getTopic()).satisfies((defaults) -> {
assertThat(defaults.getTenant()).isNull();
assertThat(defaults.getNamespace()).isNull();
assertThat(defaults.getTenant())
.isEqualTo(Extractors.byName("defaultTenant").apply(defaultTopicBuilder));
assertThat(defaults.getNamespace())
.isEqualTo(Extractors.byName("defaultNamespace").apply(defaultTopicBuilder));
});
}