Resole code review comments

- Removed POC experimental code

Author: cppwfs

basic/grpc-client/src/main/java/org/springframework/integration/samples/grpc/configuration/ClientHelloWorldConfiguration.java

@@ -189,8 +189,6 @@ IntegrationFlow grpcOutboundFlowSingleResponse(ManagedChannel managedChannel,
 	IntegrationFlow grpcOutboundFlowStreamResponse(ManagedChannel managedChannel,
 			MessageChannel grpcInputChannelStreamResponse,
 			FluxMessageChannel grpcStreamOutputChannel) {
-		//TODO: Need advice, there has to be a better way than what I have below (or is this a bug in the
-		// GrpcOutboundGateway?
 		GrpcOutboundGateway gateway = new GrpcOutboundGateway(managedChannel, HelloWorldServiceGrpc.class);
 		gateway.setMethodName("StreamSayHello");
 

basic/grpc-client/src/test/java/org/springframework/integration/samples/grpc/GrpcClientTests.java

@@ -34,7 +34,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.integration.channel.FluxMessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.grpc.proto.HelloReply;
@@ -51,10 +50,7 @@
 /**
  * @author Glenn Renfro
  */
-@SpringBootTest(properties = {
-		"spring.main.web-application-type=none",
-		"spring.main.allow-bean-definition-overriding=true"
-})
+@SpringBootTest
 class GrpcClientTests {
 
 	private static Server mockGrpcServer;
@@ -173,15 +169,13 @@ public void streamSayHello(HelloRequest request, StreamObserver<HelloReply> resp
 	private static class GrpcClientTestConfiguration {
 
 		@Bean
-		@Primary
 		public ApplicationRunner grpcClientSingleResponse() {
 			return args -> {
 				// No-op for tests
 			};
 		}
 
 		@Bean
-		@Primary
 		public ApplicationRunner grpcClientStreamResponse() {
 			return args -> {
 				// No-op for tests

basic/grpc-server/src/test/java/org/springframework/integration/samples/grpc/GrpcServerTests.java

@@ -30,20 +30,18 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle;
 import org.springframework.integration.grpc.proto.HelloReply;
 import org.springframework.integration.grpc.proto.HelloRequest;
 import org.springframework.integration.grpc.proto.HelloWorldServiceGrpc;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Glenn Renfro
  */
-@SpringBootTest(webEnvironment = WebEnvironment.NONE)
+@SpringBootTest
 @TestPropertySource(properties = "spring.grpc.server.port=0")
 class GrpcServerTests {
 
@@ -60,8 +58,7 @@ class GrpcServerTests {
 
 	@BeforeEach
 	void setUp() {
-		Object server = ReflectionTestUtils.getField(this.grpcServerLifecycle, "server");
-		this.grpcServerPort = ReflectionTestUtils.invokeMethod(server, "getPort");
+		this.grpcServerPort = this.grpcServerLifecycle.getPort();
 
 		this.channel = ManagedChannelBuilder.forAddress("localhost", this.grpcServerPort)
 				.usePlaintext()

build.gradle

@@ -329,6 +329,7 @@ subprojects { subproject ->
 			mongoDriverVersion = '5.6.2'
 			oracleDriverVersion = '23.26.0.0.0'
 			postgresVersion = '42.7.9'
+			protobufVersion = '4.29.4'
 			slf4jVersion = '2.0.17'
 			springCloudVersion = '2025.1.0'
 			springIntegrationVersion = '7.1.0-SNAPSHOT'

gradle.properties

@@ -1,6 +1,5 @@
 version=7.1.0
 springBootVersion=4.1.0-SNAPSHOT
-protobufVersion=4.29.4
 org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true