Code review response

- Config uses GrpcHeaders.SERVICE_METHOD for method def
- Removed amqp dependency update
- Removed changes to barrier pom.xml
- spring grpc now uses bom

Author: cppwfs

basic/barrier/pom.xml

@@ -73,8 +73,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-rabbitmq</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <artifactId>spring-boot-starter-amqp</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

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

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.samples.grpc.client;
 
+import java.util.Collections;
+
 import io.grpc.ManagedChannel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,6 +32,7 @@
 import org.springframework.integration.channel.FluxMessageChannel;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.grpc.GrpcHeaders;
 import org.springframework.integration.grpc.dsl.Grpc;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
@@ -47,7 +50,7 @@ public class GrpcClientConfiguration {
 
 	@Bean
 	ManagedChannel managedChannel(GrpcChannelFactory factory) {
-		return factory.createChannel("local");
+		return factory.createChannel("spring-integration");
 	}
 
 	/**
@@ -58,8 +61,7 @@ ManagedChannel managedChannel(GrpcChannelFactory factory) {
 	@Bean
 	IntegrationFlow grpcOutboundFlowSingleResponse(ManagedChannel managedChannel) {
 		return flow -> flow
-				.handle(Grpc.outboundGateway(managedChannel, SimpleGrpc.class)
-						.methodName("SayHello"));
+				.handle(Grpc.outboundGateway(managedChannel, SimpleGrpc.class));
 	}
 
 	/**
@@ -70,8 +72,7 @@ IntegrationFlow grpcOutboundFlowSingleResponse(ManagedChannel managedChannel) {
 	@Bean
 	IntegrationFlow grpcOutboundFlowStreamResponse(ManagedChannel managedChannel) {
 		return flow -> flow
-				.handle(Grpc.outboundGateway(managedChannel, SimpleGrpc.class)
-						.methodName("StreamHello"));
+				.handle(Grpc.outboundGateway(managedChannel, SimpleGrpc.class));
 	}
 
 	/**
@@ -86,6 +87,7 @@ ApplicationRunner grpcClientSingleResponse(
 		return args -> {
 			HelloReply reply = new MessagingTemplate().convertSendAndReceive(grpcInputChannelSingleResponse,
 					HelloRequest.newBuilder().setName("Jack").build(),
+					Collections.singletonMap(GrpcHeaders.SERVICE_METHOD, "SayHello"),
 					HelloReply.class);
 
 			LOGGER.info("Single response reply: " + (reply != null ? reply.getMessage() : "No reply received"));
@@ -115,6 +117,7 @@ ApplicationRunner grpcClientStreamResponse(
 				Message<?> requestMessage = MessageBuilder
 						.withPayload(HelloRequest.newBuilder().setName("Jane").build())
 						.setReplyChannel(grpcStreamOutputChannel)
+						.setHeader(GrpcHeaders.SERVICE_METHOD, "StreamHello")
 						.build();
 				grpcInputChannel.send(requestMessage);
 		};

basic/grpc-client/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 # gRPC Client Configuration
-spring.grpc.client.channels.local.address=static://localhost:9090
+spring.grpc.client.channels.spring-integration.address=static://localhost:9090

build.gradle

@@ -353,6 +353,7 @@ subprojects { subproject ->
 				mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
 				mavenBom "tools.jackson:jackson-bom:$jackson3Version"
 				mavenBom "org.junit:junit-bom:$junitJupiterVersion"
+				mavenBom "org.springframework.grpc:spring-grpc-dependencies:$springGrpc"
 			}
 		}
 
@@ -574,7 +575,7 @@ project('barrier') {
 	dependencies {
 		api 'org.springframework.boot:spring-boot-starter-web'
 		api 'org.springframework.boot:spring-boot-starter-integration'
-		api 'org.springframework.boot:spring-boot-starter-rabbitmq:4.1.0-SNAPSHOT'
+		api 'org.springframework.boot:spring-boot-starter-amqp'
 		api 'org.springframework.integration:spring-integration-amqp'
 		api 'org.springframework.integration:spring-integration-http'
 
@@ -888,14 +889,14 @@ project('grpc-client') {
 
 	dependencies {
 		implementation 'org.springframework.boot:spring-boot-starter-integration'
-		implementation "org.springframework.grpc:spring-grpc-client-spring-boot-starter:$springGrpc"
-		implementation "org.springframework.integration:spring-integration-grpc"
+		implementation "org.springframework.grpc:spring-grpc-client-spring-boot-starter"
+		implementation 'org.springframework.integration:spring-integration-grpc'
 
 		implementation("com.google.protobuf:protobuf-java:$protobufVersion")
 
 		//Test
 		testImplementation 'org.springframework.boot:spring-boot-starter-test'
-		testImplementation "org.springframework.grpc:spring-grpc-test:$springGrpc"
+		testImplementation "org.springframework.grpc:spring-grpc-test"
 	}