Combine Pulsar smoke tests

* Simplify produce/consume verify via OutputCapture

* Remove spring-boot-smoke-test-pulsar-reactive as
  no other smoke tests split them out

See gh-37196

Author: onobc

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar-reactive/build.gradle

@@ -7,6 +7,7 @@ description = "Spring Boot Pulsar smoke test"
 
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-pulsar"))
+	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-pulsar-reactive"))
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation("org.awaitility:awaitility")

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar-reactive/src/main/java/smoketest/pulsar/reactive/SampleMessage.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package smoketest.pulsar;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.pulsar.annotation.PulsarListener;
+import org.springframework.pulsar.core.PulsarTemplate;
+import org.springframework.pulsar.core.PulsarTopic;
+
+@Configuration(proxyBeanMethods = false)
+@Profile("smoketest.pulsar.imperative")
+class ImperativeAppConfig {
+
+	private static final Log LOG = LogFactory.getLog(ImperativeAppConfig.class);
+
+	private static final String TOPIC = "pulsar-smoke-test-topic";
+
+	@Bean
+	PulsarTopic pulsarTestTopic() {
+		return PulsarTopic.builder(TOPIC).numberOfPartitions(1).build();
+	}
+
+	@Bean
+	ApplicationRunner sendMessagesToPulsarTopic(PulsarTemplate<SampleMessage> template) {
+		return (args) -> {
+			for (int i = 0; i < 10; i++) {
+				template.send(TOPIC, new SampleMessage(i, "message:" + i));
+				LOG.info("++++++PRODUCE IMPERATIVE:(" + i + ")------");
+			}
+		};
+	}
+
+	@PulsarListener(topics = TOPIC)
+	void consumeMessagesFromPulsarTopic(SampleMessage msg) {
+		LOG.info("++++++CONSUME IMPERATIVE:(" + msg.id() + ")------");
+	}
+
+}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar-reactive/src/main/java/smoketest/pulsar/reactive/SampleMessageConsumer.java

@@ -14,22 +14,29 @@
  * limitations under the License.
  */
 
-package smoketest.pulsar.reactive;
+package smoketest.pulsar;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.pulsar.reactive.client.api.MessageSpec;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.pulsar.core.PulsarTopic;
+import org.springframework.pulsar.reactive.config.annotation.ReactivePulsarListener;
 import org.springframework.pulsar.reactive.core.ReactivePulsarTemplate;
 
-@SpringBootApplication
-public class SampleReactivePulsarApplication {
+@Configuration(proxyBeanMethods = false)
+@Profile("smoketest.pulsar.reactive")
+class ReactiveAppConfig {
 
-	static final String TOPIC = "pulsar-reactive-smoke-test-topic";
+	private static final Log LOG = LogFactory.getLog(ReactiveAppConfig.class);
+
+	private static final String TOPIC = "pulsar-reactive-smoke-test-topic";
 
 	@Bean
 	PulsarTopic pulsarTestTopic() {
@@ -42,12 +49,15 @@ ApplicationRunner sendMessagesToPulsarTopic(ReactivePulsarTemplate<SampleMessage
 			.map((i) -> new SampleMessage(i, "message:" + i))
 			.map(MessageSpec::of)
 			.as((msgs) -> template.send(TOPIC, msgs))
-			.doOnNext((sendResult) -> System.out.println("*** PRODUCE: " + sendResult.getMessageId()))
+			.doOnNext((sendResult) -> LOG
+				.info("++++++PRODUCE REACTIVE:(" + sendResult.getMessageSpec().getValue().id() + ")------"))
 			.subscribe();
 	}
 
-	public static void main(String[] args) {
-		SpringApplication.run(SampleReactivePulsarApplication.class, args);
+	@ReactivePulsarListener(topics = TOPIC)
+	Mono<Void> consumeMessagesFromPulsarTopic(SampleMessage msg) {
+		LOG.info("++++++CONSUME REACTIVE:(" + msg.id() + ")------");
+		return Mono.empty();
 	}
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar-reactive/src/main/resources/application.properties

@@ -16,35 +16,12 @@
 
 package smoketest.pulsar;
 
-import org.apache.pulsar.client.api.MessageId;
-
-import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.pulsar.core.PulsarTemplate;
-import org.springframework.pulsar.core.PulsarTopic;
 
 @SpringBootApplication
 public class SamplePulsarApplication {
 
-	static final String TOPIC = "pulsar-smoke-test-topic";
-
-	@Bean
-	PulsarTopic pulsarTestTopic() {
-		return PulsarTopic.builder(TOPIC).numberOfPartitions(1).build();
-	}
-
-	@Bean
-	ApplicationRunner sendMessagesToPulsarTopic(PulsarTemplate<SampleMessage> template) {
-		return (args) -> {
-			for (int i = 0; i < 10; i++) {
-				MessageId msgId = template.send(TOPIC, new SampleMessage(i, "message:" + i));
-				System.out.println("*** PRODUCE: " + msgId);
-			}
-		};
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(SamplePulsarApplication.class, args);
 	}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar-reactive/src/test/java/smoketest/pulsar/reactive/SampleReactivePulsarApplicationTests.java

@@ -1 +1 @@
-spring.pulsar.consumer.subscription-initial-position=earliest
+spring.pulsar.consumer.subscription.initial-position=earliest