Move default tenant/namespace config prop under spring.pulsar.defaults.topic

Author: onobc

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

@@ -182,9 +182,10 @@ PulsarFunctionAdministration pulsarFunctionAdministration(PulsarAdministration p
 	@Bean
 	@Scope("prototype")
 	@ConditionalOnMissingBean
+	@ConditionalOnProperty(name = "spring.pulsar.defaults.topic.enabled", havingValue = "true", matchIfMissing = true)
 	PulsarTopicBuilder pulsarTopicBuilder() {
-		return new PulsarTopicBuilder(TopicDomain.persistent, this.properties.getDefaults().getTenant(),
-				this.properties.getDefaults().getNamespace());
+		return new PulsarTopicBuilder(TopicDomain.persistent, this.properties.getDefaults().getTopic().getTenant(),
+				this.properties.getDefaults().getTopic().getNamespace());
 	}
 
 }

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

@@ -250,41 +250,21 @@ public Authentication getAuthentication() {
 
 	public static class Defaults {
 
-		/**
-		 * 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'.
-		 */
-		private String tenant;
-
-		/**
-		 * 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'.
-		 */
-		private String namespace;
-
 		/**
 		 * List of mappings from message type to topic name and schema info to use as a
 		 * defaults when a topic name and/or schema is not explicitly specified when
 		 * producing or consuming messages of the mapped type.
 		 */
 		private List<TypeMapping> typeMappings = new ArrayList<>();
 
-		public String getTenant() {
-			return this.tenant;
-		}
+		private Topic topic = new Topic();
 
-		public void setTenant(String tenant) {
-			this.tenant = tenant;
+		public Topic getTopic() {
+			return this.topic;
 		}
 
-		public String getNamespace() {
-			return this.namespace;
-		}
-
-		public void setNamespace(String namespace) {
-			this.namespace = namespace;
+		public void setTopic(Topic topic) {
+			this.topic = topic;
 		}
 
 		public List<TypeMapping> getTypeMappings() {
@@ -331,6 +311,40 @@ public record SchemaInfo(SchemaType schemaType, Class<?> messageKeyType) {
 
 		}
 
+		public static class Topic {
+
+			/**
+			 * 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'.
+			 */
+			private String tenant;
+
+			/**
+			 * 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'.
+			 */
+			private String namespace;
+
+			public String getTenant() {
+				return this.tenant;
+			}
+
+			public void setTenant(String tenant) {
+				this.tenant = tenant;
+			}
+
+			public String getNamespace() {
+				return this.namespace;
+			}
+
+			public void setNamespace(String namespace) {
+				this.namespace = namespace;
+			}
+
+		}
+
 	}
 
 	public static class Function {

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -2068,6 +2068,12 @@
       "name": "spring.neo4j.uri",
       "defaultValue": "bolt://localhost:7687"
     },
+    {
+      "name": "spring.pulsar.defaults.topic.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable default tenant and namespace support for topics.",
+      "defaultValue": true
+    },
     {
       "name": "spring.pulsar.function.enabled",
       "type": "java.lang.Boolean",

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

@@ -333,11 +333,17 @@ void whenHasUserDefinedBeanDoesNotAutoConfigureBean() {
 				.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class).isSameAs(topicBuilder));
 		}
 
+		@Test
+		void whenHasDefaultsTopicDisabledPropertyDoesNotCreateBean() {
+			this.contextRunner.withPropertyValues("spring.pulsar.defaults.topic.enabled=false")
+				.run((context) -> assertThat(context).doesNotHaveBean(PulsarTopicBuilder.class));
+		}
+
 		@Test
 		void whenHasDefaultsTenantAndNamespaceAppliedToTopicBuilder() {
 			List<String> properties = new ArrayList<>();
-			properties.add("spring.pulsar.defaults.tenant=my-tenant");
-			properties.add("spring.pulsar.defaults.namespace=my-namespace");
+			properties.add("spring.pulsar.defaults.topic.tenant=my-tenant");
+			properties.add("spring.pulsar.defaults.topic.namespace=my-namespace");
 			this.contextRunner.withPropertyValues(properties.toArray(String[]::new))
 				.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class)
 					.asInstanceOf(InstanceOfAssertFactories.type(PulsarTopicBuilder.class))

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

@@ -247,7 +247,7 @@ class DefaultsTenantNamespaceProperties {
 
 		@Test
 		void bindWhenValuesNotSpecified() {
-			assertThat(new PulsarProperties().getDefaults()).satisfies((defaults) -> {
+			assertThat(new PulsarProperties().getDefaults().getTopic()).satisfies((defaults) -> {
 				assertThat(defaults.getTenant()).isNull();
 				assertThat(defaults.getNamespace()).isNull();
 			});
@@ -256,9 +256,9 @@ void bindWhenValuesNotSpecified() {
 		@Test
 		void bindWhenValuesSpecified() {
 			Map<String, String> map = new HashMap<>();
-			map.put("spring.pulsar.defaults.tenant", "my-tenant");
-			map.put("spring.pulsar.defaults.namespace", "my-namespace");
-			PulsarProperties.Defaults properties = bindProperties(map).getDefaults();
+			map.put("spring.pulsar.defaults.topic.tenant", "my-tenant");
+			map.put("spring.pulsar.defaults.topic.namespace", "my-namespace");
+			PulsarProperties.Defaults.Topic properties = bindProperties(map).getDefaults().getTopic();
 			assertThat(properties.getTenant()).isEqualTo("my-tenant");
 			assertThat(properties.getNamespace()).isEqualTo("my-namespace");
 		}