SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

method already has a condition to retrieve immediateGenericType for a message

Browse Source 
This condition was meant to be removed as part of #543

Resolves #624
This commit is contained in:
ncheema
2020-12-21 15:26:30 -08:00
committed by Oleg Zhurakousky
parent d0a0da24bc
commit 9bbb86be2d
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java
View File

@@ -91,9 +91,7 @@ public final class FunctionTypeUtils {
if (isPublisher(type) || isMessage(type)) {
type = getImmediateGenericType(type, 0);
}
if (isMessage(type)) {
type = getImmediateGenericType(type, 0);
}
return TypeResolver.reify(type instanceof GenericArrayType ? type : TypeResolver.reify(type));
}

3
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java
View File

@@ -144,7 +144,8 @@ public class FunctionTypeUtilsTests {
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<String>() { }.getType())).isFalse();
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<List<String>>() { }.getType())).isTrue();
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<Flux<List<String>>>() { }.getType())).isTrue();
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<Flux<Message<List<String>>>>() { }.getType())).isTrue();
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<Flux<List<Message<String>>>>() { }.getType())).isTrue();
assertThat(FunctionTypeUtils.isTypeCollection(new ParameterizedTypeReference<Flux<Message<List<String>>>>() { }.getType())).isFalse();
}
private static Function<String, Integer> function() {

13
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
View File

@@ -206,9 +206,11 @@ public class ContextFunctionCatalogAutoConfigurationTests {
assertThat(function).isInstanceOf(Function.class);
assertThat(function.isInputTypeMessage()).isTrue();
Type inputType = function.getInputType();
final Type inputType = function.getInputType();
assertThat((Class<?>) FunctionTypeUtils.getGenericType(inputType)).isAssignableFrom(String.class);
assertThat(FunctionTypeUtils.getRawType(inputType)).isAssignableFrom(Flux.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(inputType))).isAssignableFrom(Message.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(FunctionTypeUtils.getGenericType(inputType)))).isAssignableFrom(String.class);
}
@Test
@@ -219,9 +221,12 @@ public class ContextFunctionCatalogAutoConfigurationTests {
assertThat(function).isInstanceOf(Function.class);
assertThat(function.isInputTypeMessage()).isTrue();
Type inputType = function.getInputType();
assertThat((Class<?>) FunctionTypeUtils.getGenericType(inputType)).isAssignableFrom(String.class);
final Type inputType = function.getInputType();
assertThat(FunctionTypeUtils.getRawType(inputType)).isAssignableFrom(Publisher.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(inputType))).isAssignableFrom(Message.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(FunctionTypeUtils.getGenericType(inputType)))).isAssignableFrom(String.class);
}
@Test