Remove references to channel factory in filter

Same as we did for the server factory, but without (yet anyway)
adding a factory customizer.

Author: dsyer

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

@@ -30,10 +30,9 @@ public interface ClientInterceptorFilter {
 	 * Determine whether the given {@link ClientInterceptor} should be included for the
 	 * provided {@link GrpcChannelFactory}.
 	 * @param interceptor the client interceptor under consideration.
-	 * @param channelFactory the channel factory in use.
 	 * @return {@code true} if the interceptor should be included; {@code false}
 	 * otherwise.
 	 */
-	boolean filter(ClientInterceptor interceptor, GrpcChannelFactory channelFactory);
+	boolean filter(ClientInterceptor interceptor);
 
 }

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

@@ -92,7 +92,7 @@ public boolean supports(String target) {
 
 	@Override
 	public boolean supports(ClientInterceptor interceptor) {
-		return this.interceptorFilter == null || this.interceptorFilter.filter(interceptor, this);
+		return this.interceptorFilter == null || this.interceptorFilter.filter(interceptor);
 	}
 
 	public void setVirtualTargets(VirtualTargets targets) {

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

@@ -177,8 +177,8 @@ class WithInterceptorFilter {
 		@Test
 		void whenFilterExcludesOneGlobalInterceptor_thenBuilderGetsOnlyAllowedOnes() {
 			ManagedChannelBuilder<?> builder = Mockito.mock();
-			ClientInterceptorFilter filter = (interceptor,
-					__) -> interceptor == GlobalClientInterceptorsConfig.GLOBAL_INTERCEPTOR_BAR;
+			ClientInterceptorFilter filter = (
+					interceptor) -> interceptor == GlobalClientInterceptorsConfig.GLOBAL_INTERCEPTOR_BAR;
 			ClientInterceptorsConfigurerTests.this.contextRunner()
 				.withUserConfiguration(GlobalClientInterceptorsConfig.class)
 				.run(context -> {
@@ -194,7 +194,7 @@ void whenFilterExcludesOneGlobalInterceptor_thenBuilderGetsOnlyAllowedOnes() {
 		@Test
 		void whenFilterIncludesAllGlobalInterceptors_thenBuilderGetsOnlyAllowedOnes() {
 			ManagedChannelBuilder<?> builder = Mockito.mock();
-			ClientInterceptorFilter filter = (interceptor, __) -> true;
+			ClientInterceptorFilter filter = (interceptor) -> true;
 			ClientInterceptorsConfigurerTests.this.contextRunner()
 				.withUserConfiguration(GlobalClientInterceptorsConfig.class)
 				.run(context -> {