remove serverFactory from ServerServiceDefinitionFilter

Signed-off-by: Andrey Litvitski <[email protected]>

Author: therepanic

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

@@ -28,6 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.grpc.internal.GrpcUtils;
+import org.springframework.lang.Nullable;
 
 import com.google.common.collect.Lists;
 import io.grpc.Grpc;
@@ -77,7 +78,7 @@ public DefaultGrpcServerFactory(String address, List<ServerBuilderCustomizer<T>>
 
 	public DefaultGrpcServerFactory(String address, List<ServerBuilderCustomizer<T>> serverBuilderCustomizers,
 			KeyManagerFactory keyManager, TrustManagerFactory trustManager, ClientAuth clientAuth,
-			ServerServiceDefinitionFilter serviceFilter) {
+			@Nullable ServerServiceDefinitionFilter serviceFilter) {
 		this(address, serverBuilderCustomizers);
 		this.keyManager = keyManager;
 		this.trustManager = trustManager;
@@ -98,7 +99,7 @@ public Server createServer() {
 
 	@Override
 	public void addService(ServerServiceDefinition service) {
-		if (this.serviceFilter == null || this.serviceFilter.filter(service, this)) {
+		if (this.serviceFilter == null || this.serviceFilter.filter(service)) {
 			this.serviceList.add(service);
 		}
 	}

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

@@ -21,6 +21,8 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.springframework.lang.Nullable;
+
 import io.grpc.TlsServerCredentials.ClientAuth;
 import io.grpc.netty.NettyServerBuilder;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -37,7 +39,8 @@ public class NettyGrpcServerFactory extends DefaultGrpcServerFactory<NettyServer
 
 	public NettyGrpcServerFactory(String address,
 			List<ServerBuilderCustomizer<NettyServerBuilder>> serverBuilderCustomizers, KeyManagerFactory keyManager,
-			TrustManagerFactory trustManager, ClientAuth clientAuth, ServerServiceDefinitionFilter serviceFilter) {
+			TrustManagerFactory trustManager, ClientAuth clientAuth,
+			@Nullable ServerServiceDefinitionFilter serviceFilter) {
 		super(address, serverBuilderCustomizers, keyManager, trustManager, clientAuth, serviceFilter);
 	}
 

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

@@ -19,7 +19,7 @@
 
 /**
  * Strategy to determine whether a {@link ServerServiceDefinition} should be included for
- * a given {@link GrpcServerFactory server factory}.
+ * the {@link GrpcServerFactory server factory}.
  *
  * @author Andrey Litvitski
  */
@@ -28,11 +28,10 @@ public interface ServerServiceDefinitionFilter {
 
 	/**
 	 * Determine whether the given {@link ServerServiceDefinition} should be included for
-	 * the provided {@link GrpcServerFactory server factory}.
+	 * the {@link GrpcServerFactory server factory}.
 	 * @param serviceDefinition the gRPC service definition under consideration.
-	 * @param serverFactory the server factory in use.
 	 * @return {@code true} if the service should be included; {@code false} otherwise.
 	 */
-	boolean filter(ServerServiceDefinition serviceDefinition, GrpcServerFactory serverFactory);
+	boolean filter(ServerServiceDefinition serviceDefinition);
 
 }

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

@@ -21,6 +21,8 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.springframework.lang.Nullable;
+
 import io.grpc.TlsServerCredentials.ClientAuth;
 import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
 import io.grpc.netty.shaded.io.netty.channel.epoll.EpollEventLoopGroup;
@@ -37,7 +39,8 @@ public class ShadedNettyGrpcServerFactory extends DefaultGrpcServerFactory<Netty
 
 	public ShadedNettyGrpcServerFactory(String address,
 			List<ServerBuilderCustomizer<NettyServerBuilder>> serverBuilderCustomizers, KeyManagerFactory keyManager,
-			TrustManagerFactory trustManager, ClientAuth clientAuth, ServerServiceDefinitionFilter serviceFilter) {
+			TrustManagerFactory trustManager, ClientAuth clientAuth,
+			@Nullable ServerServiceDefinitionFilter serviceFilter) {
 		super(address, serverBuilderCustomizers, keyManager, trustManager, clientAuth, serviceFilter);
 	}
 

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerFactoryConfigurations.java

@@ -17,6 +17,7 @@
 package org.springframework.grpc.autoconfigure.server;
 
 import java.util.List;
+import java.util.Optional;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
@@ -31,11 +32,7 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.grpc.server.GrpcServerFactory;
-import org.springframework.grpc.server.InProcessGrpcServerFactory;
-import org.springframework.grpc.server.NettyGrpcServerFactory;
-import org.springframework.grpc.server.ServerBuilderCustomizer;
-import org.springframework.grpc.server.ShadedNettyGrpcServerFactory;
+import org.springframework.grpc.server.*;
 import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle;
 import org.springframework.grpc.server.service.GrpcServiceConfigurer;
 import org.springframework.grpc.server.service.GrpcServiceDiscoverer;
@@ -62,7 +59,8 @@ static class ShadedNettyServerFactoryConfiguration {
 		@Bean
 		ShadedNettyGrpcServerFactory shadedNettyGrpcServerFactory(GrpcServerProperties properties,
 				GrpcServiceDiscoverer serviceDiscoverer, GrpcServiceConfigurer serviceConfigurer,
-				ServerBuilderCustomizers serverBuilderCustomizers, SslBundles bundles) {
+				ServerBuilderCustomizers serverBuilderCustomizers, SslBundles bundles,
+				Optional<ServerServiceDefinitionFilter> serviceFilter) {
 			ShadedNettyServerFactoryPropertyMapper mapper = new ShadedNettyServerFactoryPropertyMapper(properties);
 			List<ServerBuilderCustomizer<io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder>> builderCustomizers = List
 				.of(mapper::customizeServerBuilder, serverBuilderCustomizers::customize);
@@ -75,7 +73,8 @@ ShadedNettyGrpcServerFactory shadedNettyGrpcServerFactory(GrpcServerProperties p
 						: io.grpc.netty.shaded.io.netty.handler.ssl.util.InsecureTrustManagerFactory.INSTANCE;
 			}
 			ShadedNettyGrpcServerFactory factory = new ShadedNettyGrpcServerFactory(properties.getAddress(),
-					builderCustomizers, keyManager, trustManager, properties.getSsl().getClientAuth());
+					builderCustomizers, keyManager, trustManager, properties.getSsl().getClientAuth(),
+					serviceFilter.orElse(null));
 			serviceDiscoverer.findServices().stream().map(serviceConfigurer::configure).forEach(factory::addService);
 			return factory;
 		}
@@ -101,7 +100,8 @@ static class NettyServerFactoryConfiguration {
 		@Bean
 		NettyGrpcServerFactory nettyGrpcServerFactory(GrpcServerProperties properties,
 				GrpcServiceDiscoverer serviceDiscoverer, GrpcServiceConfigurer serviceConfigurer,
-				ServerBuilderCustomizers serverBuilderCustomizers, SslBundles bundles) {
+				ServerBuilderCustomizers serverBuilderCustomizers, SslBundles bundles,
+				Optional<ServerServiceDefinitionFilter> serviceFilter) {
 			NettyServerFactoryPropertyMapper mapper = new NettyServerFactoryPropertyMapper(properties);
 			List<ServerBuilderCustomizer<NettyServerBuilder>> builderCustomizers = List
 				.of(mapper::customizeServerBuilder, serverBuilderCustomizers::customize);
@@ -114,7 +114,7 @@ NettyGrpcServerFactory nettyGrpcServerFactory(GrpcServerProperties properties,
 						: InsecureTrustManagerFactory.INSTANCE;
 			}
 			NettyGrpcServerFactory factory = new NettyGrpcServerFactory(properties.getAddress(), builderCustomizers,
-					keyManager, trustManager, properties.getSsl().getClientAuth());
+					keyManager, trustManager, properties.getSsl().getClientAuth(), serviceFilter.orElse(null));
 			serviceDiscoverer.findServices().stream().map(serviceConfigurer::configure).forEach(factory::addService);
 			return factory;
 		}

spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfigurationTests.java

@@ -45,7 +45,13 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
-import org.springframework.grpc.server.*;
+import org.springframework.grpc.server.DefaultGrpcServerFactory;
+import org.springframework.grpc.server.GrpcServerFactory;
+import org.springframework.grpc.server.InProcessGrpcServerFactory;
+import org.springframework.grpc.server.NettyGrpcServerFactory;
+import org.springframework.grpc.server.ServerBuilderCustomizer;
+import org.springframework.grpc.server.ServerServiceDefinitionFilter;
+import org.springframework.grpc.server.ShadedNettyGrpcServerFactory;
 import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle;
 import org.springframework.grpc.server.service.DefaultGrpcServiceConfigurer;
 import org.springframework.grpc.server.service.DefaultGrpcServiceDiscoverer;
@@ -413,7 +419,7 @@ void whenFilterExcludesOneServiceThenServerListGetAllowedOnes() {
 			ServerServiceDefinition serviceDefinitionA = mock();
 			GrpcServerAutoConfigurationTests.this.contextRunner()
 				.withBean(ServerServiceDefinitionFilter.class,
-						() -> (serviceDefinition, ___) -> serviceDefinition.equals(serviceDefinitionA))
+						() -> (serviceDefinition) -> serviceDefinition.equals(serviceDefinitionA))
 				.run((context) -> {
 					DefaultGrpcServerFactory<?> defaultGrpcServerFactory = (DefaultGrpcServerFactory<?>) context
 						.getBean(GrpcServerFactory.class);
@@ -430,7 +436,7 @@ void whenFilterExcludesOneServiceThenServerListGetAllowedOnes() {
 		@Test
 		void whenFilterIncludesAllServicesThenServerListGetAllowedOnes() {
 			GrpcServerAutoConfigurationTests.this.contextRunner()
-				.withBean(ServerServiceDefinitionFilter.class, () -> (__, ___) -> true)
+				.withBean(ServerServiceDefinitionFilter.class, () -> (__) -> true)
 				.run((context) -> {
 					DefaultGrpcServerFactory<?> defaultGrpcServerFactory = (DefaultGrpcServerFactory<?>) context
 						.getBean(GrpcServerFactory.class);