Initialize stub factories always the same way

Fixes gh-217

Author: dsyer

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

@@ -88,9 +88,7 @@ private StubFactory<?> findFactory(Class<?> factoryType, Class<?> type) {
 			}
 			AnnotationAwareOrderComparator.sort(factories);
 			for (StubFactory<?> factory : factories) {
-				if (supports(factory.getClass(), type)) {
-					this.factories.put(factory.getClass(), factory);
-				}
+				this.factories.put(factory.getClass(), factory);
 			}
 			for (Class<?> factory : DEFAULT_FACTORIES) {
 				if (this.factories.containsKey(factory)) {

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

@@ -46,7 +46,7 @@ public class GrpcClientFactoryTests {
 
 	GrpcClientFactoryTests() {
 		Mockito.when(channelFactory.createChannel(Mockito.anyString(), Mockito.any()))
-			.thenReturn(Mockito.mock(ManagedChannel.class));
+				.thenReturn(Mockito.mock(ManagedChannel.class));
 		context.registerBean(GrpcChannelFactory.class, () -> channelFactory);
 		factory = new GrpcClientFactory();
 		factory.setApplicationContext(context);
@@ -75,7 +75,7 @@ void testCustomStubFactory() {
 	void testWithExplicitStubFactory() {
 		context.registerBean(OtherStubFactory.class, () -> new OtherStubFactory());
 		GrpcClientFactory.register(context, new GrpcClientRegistrationSpec("local", new Class[] { OtherStub.class })
-			.factory(OtherStubFactory.class));
+				.factory(OtherStubFactory.class));
 		assertThat(factory.getClient("local", OtherStub.class, null)).isNotNull();
 	}
 
@@ -96,11 +96,25 @@ void testCoroutineStubFactory() {
 		context.registerBean(CoroutineStubFactory.class, CoroutineStubFactory::new);
 		GrpcClientFactory.register(context,
 				GrpcClientRegistrationSpec.of("local")
-					.factory(CoroutineStubFactory.class)
-					.types(MyCoroutineStub.class));
+						.factory(CoroutineStubFactory.class)
+						.types(MyCoroutineStub.class));
 		assertThat(factory.getClient("local", MyCoroutineStub.class, null)).isNotNull();
 	}
 
+	@Test
+	void testCoroutineStubFactoryAfterDefault() {
+		context.registerBean(CoroutineStubFactory.class, CoroutineStubFactory::new);
+		GrpcClientFactory.register(context,
+				GrpcClientRegistrationSpec.of("local")
+						.types(MyStub.class));
+		GrpcClientFactory.register(context,
+				GrpcClientRegistrationSpec.of("local")
+						.factory(CoroutineStubFactory.class)
+						.types(MyCoroutineStub.class));
+		assertThat(factory.getClient("local", MyCoroutineStub.class, null)).isNotNull();
+		assertThat(factory.getClient("local", MyStub.class, null)).isNotNull();
+	}
+
 	static class OtherStubFactory implements StubFactory<OtherStub> {
 
 		@Override