Fixes to allow non-test inprocess channels

- Fix @LocalGrpcPort to ignore the inprocess factory port
- Don't set load balancer policy for inprocess channel factory

Signed-off-by: Chris Bono <[email protected]>

Author: onobc

samples/grpc-server/src/test/java/org/springframework/grpc/sample/GrpcServerIntegrationTests.java

@@ -338,6 +338,23 @@ void clientChannelWithSsl(@Autowired GrpcChannelFactory channels) {
 
 	}
 
+	@Nested
+	@SpringBootTest(properties = { "spring.grpc.server.inprocess.name=foo", "spring.grpc.server.host=0.0.0.0",
+			"spring.grpc.server.port=0" })
+	class ServerWithRegularAndInProcessChannelsAndFactories {
+
+		@Test
+		void servesResponseToNonInProcessClient(@Autowired GrpcChannelFactory channels, @LocalGrpcPort int port) {
+			assertThatResponseIsServedToChannel(channels.createChannel("0.0.0.0:" + port));
+		}
+
+		@Test
+		void servesResponseToInProcessClient(@Autowired GrpcChannelFactory channels) {
+			assertThatResponseIsServedToChannel(channels.createChannel("in-process:foo"));
+		}
+
+	}
+
 	private void assertThatResponseIsServedToChannel(ManagedChannel clientChannel) {
 		SimpleGrpc.SimpleBlockingStub client = SimpleGrpc.newBlockingStub(clientChannel);
 		HelloReply response = client.sayHello(HelloRequest.newBuilder().setName("Alien").build());

spring-grpc-core/src/main/java/org/springframework/grpc/server/lifecycle/GrpcServerLifecycle.java

@@ -107,6 +107,14 @@ public int getPort() {
 		return this.server == null ? 0 : this.server.getPort();
 	}
 
+	/**
+	 * Gets the server factory used to create the server.
+	 * @return the server factory to create the server
+	 */
+	public GrpcServerFactory getFactory() {
+		return this.factory;
+	}
+
 	/**
 	 * Creates and starts the grpc server.
 	 * @throws IOException If the server is unable to bind the port.

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/ClientPropertiesChannelBuilderCustomizer.java

@@ -49,7 +49,7 @@ public void customize(String authority, T builder) {
 		ChannelConfig channel = this.properties.getChannel(authority);
 		PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		mapper.from(channel.getUserAgent()).to(builder::userAgent);
-		if (!authority.startsWith("unix:")) {
+		if (!authority.startsWith("unix:") && !authority.startsWith("in-process:")) {
 			mapper.from(channel.getDefaultLoadBalancingPolicy()).to(builder::defaultLoadBalancingPolicy);
 		}
 		mapper.from(channel.getMaxInboundMessageSize()).asInt(DataSize::toBytes).to(builder::maxInboundMessageSize);

spring-grpc-test/src/main/java/org/springframework/grpc/test/ServerPortInfoApplicationContextInitializer.java

@@ -26,6 +26,7 @@
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
+import org.springframework.grpc.server.InProcessGrpcServerFactory;
 import org.springframework.grpc.server.lifecycle.GrpcServerStartedEvent;
 
 public class ServerPortInfoApplicationContextInitializer implements
@@ -43,6 +44,9 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
 
 	@Override
 	public void onApplicationEvent(GrpcServerStartedEvent event) {
+		if (event.getSource().getFactory() instanceof InProcessGrpcServerFactory) {
+			return;
+		}
 		String propertyName = "local.grpc.port";
 		setPortProperty(applicationContext, propertyName, event.getPort());
 	}