Adjust test to account for new order of subtype precedence

Author: onobc

spring-pulsar/src/test/java/org/springframework/pulsar/listener/PulsarListenerTests.java

@@ -74,7 +74,7 @@
 import org.springframework.pulsar.core.TopicResolver;
 import org.springframework.pulsar.listener.PulsarListenerTests.PulsarHeadersCustomObjectMapperTest.PulsarHeadersCustomObjectMapperTestConfig;
 import org.springframework.pulsar.listener.PulsarListenerTests.SubscriptionTypeTests.WithDefaultType.WithDefaultTypeConfig;
-import org.springframework.pulsar.listener.PulsarListenerTests.SubscriptionTypeTests.WithSpecificTypes.WithSpecificTypesConfig;
+import org.springframework.pulsar.listener.PulsarListenerTests.SubscriptionTypeTests.WithSubscriptionTypes.WithSubscriptionTypesConfig;
 import org.springframework.pulsar.support.PulsarHeaders;
 import org.springframework.pulsar.support.header.JsonPulsarHeaderMapper;
 import org.springframework.pulsar.test.model.UserPojo;
@@ -1089,61 +1089,69 @@ void listenWithoutTypeSetAnywhere(String ignored, Consumer<String> consumer) {
 
 		}
 
+		/**
+		 * Tests the following order of setting the subscription type:
+		 * <pre>
+		 * - 1) ConsumerFactory defaultConfigCustomizer
+		 * - 2) ContainerFactory props.subType (default is Exclusive)
+		 * - 3) PulsarListener subType attribute
+		 * - 4) PulsarListener customizer attribute
+		 * </pre>
+		 */
 		@Nested
-		@ContextConfiguration(classes = WithSpecificTypesConfig.class)
-		class WithSpecificTypes {
+		@ContextConfiguration(classes = WithSubscriptionTypesConfig.class)
+		class WithSubscriptionTypes {
 
-			static final CountDownLatch latchTypeSetConsumerFactory = new CountDownLatch(1);
+			static final CountDownLatch latchTypeSetOnContainerFactory = new CountDownLatch(1);
 
-			static final CountDownLatch latchTypeSetAnnotation = new CountDownLatch(1);
+			static final CountDownLatch latchTypeSetOnAnnotation = new CountDownLatch(1);
 
-			static final CountDownLatch latchWithCustomizer = new CountDownLatch(1);
+			static final CountDownLatch latchTypeSetOnCustomizer = new CountDownLatch(1);
 
 			@Test
-			void whenTypeSetOnlyInConsumerFactoryThenConsumerFactoryTypeIsUsed() throws Exception {
-				pulsarTemplate.send("typeSetConsumerFactory-topic", "hello-typeSetConsumerFactory");
-				assertThat(latchTypeSetConsumerFactory.await(5, TimeUnit.SECONDS)).isTrue();
+			void typeSetOnContainerFactoryUsedWhenNotSetElsewhere() throws Exception {
+				pulsarTemplate.send("typeSetOnContainerFactory-topic", "hello-typeSetOnContainerFactory");
+				assertThat(latchTypeSetOnContainerFactory.await(5, TimeUnit.SECONDS)).isTrue();
 			}
 
 			@Test
-			void whenTypeSetOnAnnotationThenAnnotationTypeIsUsed() throws Exception {
-				pulsarTemplate.send("typeSetAnnotation-topic", "hello-typeSetAnnotation");
-				assertThat(latchTypeSetAnnotation.await(5, TimeUnit.SECONDS)).isTrue();
+			void typeSetOnAnnotationOverridesTypeSetOnContainerFactory() throws Exception {
+				pulsarTemplate.send("typeSetOnAnnotation-topic", "hello-typeSetOnAnnotation");
+				assertThat(latchTypeSetOnAnnotation.await(5, TimeUnit.SECONDS)).isTrue();
 			}
 
 			@Test
-			void whenTypeSetWithCustomizerThenCustomizerTypeIsUsed() throws Exception {
-				pulsarTemplate.send("typeSetCustomizer-topic", "hello-typeSetCustomizer");
-				assertThat(latchWithCustomizer.await(5, TimeUnit.SECONDS)).isTrue();
+			void typeSetOnCustomizerOverridesTypeSetOnAnnotation() throws Exception {
+				pulsarTemplate.send("typeSetOnCustomizer-topic", "hello-typeSetOnCustomizer");
+				assertThat(latchTypeSetOnCustomizer.await(5, TimeUnit.SECONDS)).isTrue();
 			}
 
 			@Configuration(proxyBeanMethods = false)
-			static class WithSpecificTypesConfig {
+			static class WithSubscriptionTypesConfig {
 
 				@Bean
-				ConsumerBuilderCustomizer<String> consumerFactoryDefaultSubTypeCustomizer() {
+				ConsumerBuilderCustomizer<String> consumerFactoryCustomizerSubTypeIsIgnored() {
 					return (b) -> b.subscriptionType(SubscriptionType.Shared);
 				}
 
-				@PulsarListener(topics = "typeSetConsumerFactory-topic",
-						subscriptionName = "typeSetConsumerFactory-sub", subscriptionType = {})
-				void listenWithTypeSetOnlyOnConsumerFactory(String ignored, Consumer<String> consumer) {
-					assertSubscriptionType(consumer).isEqualTo(SubscriptionType.Shared);
-					latchTypeSetConsumerFactory.countDown();
+				@PulsarListener(topics = "typeSetOnContainerFactory-topic", subscriptionName = "typeSetOnContainerFactory-sub")
+				void listenWithTypeSetOnlyOnContainerFactory(String ignored, Consumer<String> consumer) {
+					assertSubscriptionType(consumer).isEqualTo(SubscriptionType.Exclusive);
+					latchTypeSetOnContainerFactory.countDown();
 				}
 
-				@PulsarListener(topics = "typeSetAnnotation-topic", subscriptionName = "typeSetAnnotation-sub",
+				@PulsarListener(topics = "typeSetOnAnnotation-topic", subscriptionName = "typeSetOnAnnotation-sub",
 						subscriptionType = SubscriptionType.Key_Shared)
 				void listenWithTypeSetOnAnnotation(String ignored, Consumer<String> consumer) {
 					assertSubscriptionType(consumer).isEqualTo(SubscriptionType.Key_Shared);
-					latchTypeSetAnnotation.countDown();
+					latchTypeSetOnAnnotation.countDown();
 				}
 
-				@PulsarListener(topics = "typeSetCustomizer-topic", subscriptionName = "typeSetCustomizer-sub",
+				@PulsarListener(topics = "typeSetOnCustomizer-topic", subscriptionName = "typeSetOnCustomizer-sub",
 						subscriptionType = SubscriptionType.Key_Shared, consumerCustomizer = "myCustomizer")
-				void listenWithTypeSetInCustomizer(String ignored, Consumer<String> consumer) {
+				void listenWithTypeSetOnCustomizer(String ignored, Consumer<String> consumer) {
 					assertSubscriptionType(consumer).isEqualTo(SubscriptionType.Failover);
-					latchWithCustomizer.countDown();
+					latchTypeSetOnCustomizer.countDown();
 				}
 
 				@Bean