Polish "Add client interceptor filter support"

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

Author: onobc

spring-grpc-core/src/main/java/org/springframework/grpc/client/ClientInterceptorsConfigurer.java

@@ -22,7 +22,9 @@
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.log.LogAccessor;
 import org.springframework.grpc.internal.ApplicationContextBeanLookupUtils;
 
 import io.grpc.ClientInterceptor;
@@ -36,6 +38,8 @@
  */
 public class ClientInterceptorsConfigurer implements InitializingBean {
 
+	private final LogAccessor log = new LogAccessor(getClass());
+
 	private final ApplicationContext applicationContext;
 
 	private List<ClientInterceptor> globalInterceptors;
@@ -87,7 +91,14 @@ private ClientInterceptorFilter findInterceptorFilter() {
 		try {
 			return this.applicationContext.getBean(ClientInterceptorFilter.class);
 		}
+		catch (NoUniqueBeanDefinitionException noUniqueBeanEx) {
+			this.log.warn(noUniqueBeanEx,
+					() -> "No unique ClientInterceptorFilter bean found. Consider defining a single bean or marking one as @Primary");
+			return null;
+		}
 		catch (NoSuchBeanDefinitionException ignored) {
+			this.log.debug(
+					() -> "No ClientInterceptorFilter bean found - filtering will not be applied to client interceptors.");
 			return null;
 		}
 	}

spring-grpc-core/src/test/java/org/springframework/grpc/client/ClientInterceptorsConfigurerTests.java

@@ -173,7 +173,7 @@ void whenBlendInterceptorsTrueThenGlobalInterceptorsBlended() {
 	}
 
 	@Nested
-	class WithInterceptorFilters {
+	class WithInterceptorFilter {
 
 		@Test
 		void whenFilterExcludesOneGlobalInterceptor_thenBuilderGetsOnlyAllowedOnes() {
@@ -196,7 +196,7 @@ void whenFilterIncludesAllGlobalInterceptors_thenBuilderGetsOnlyAllowedOnes() {
 			ManagedChannelBuilder<?> builder = Mockito.mock();
 			ClientInterceptorsConfigurerTests.this.contextRunner()
 				.withUserConfiguration(GlobalClientInterceptorsConfig.class)
-				.withBean(ClientInterceptorFilter.class, () -> (interceptor, __) -> true)
+				.withBean(ClientInterceptorFilter.class, () -> (__, ___) -> true)
 				.run(context -> {
 					var factory = Mockito.mock(GrpcChannelFactory.class);
 					var configurer = context.getBean(ClientInterceptorsConfigurer.class);