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

Clean up FunctionTypeUtils.isOfType method

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-03-02 09:55:45 +01:00
parent 67a4642b2d
commit 2b4f8c7958
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,8 +308,13 @@ public final class FunctionTypeUtils {
} }
public static boolean isOfType(Type type, Class<?> cls) { public static boolean isOfType(Type type, Class<?> cls) {
Class<?> c = type instanceof ParameterizedType ? (Class<?>) ((ParameterizedType) type).getRawType() : (Class<?>) type; if (type instanceof Class) {
return cls.isAssignableFrom(c); return cls.isAssignableFrom((Class<?>) type);
}
else if (type instanceof ParameterizedType) {
return isOfType(((ParameterizedType) type).getRawType(), cls);
}
return false;
} }
public static boolean isMono(Type type) { public static boolean isMono(Type type) {

4
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2019-2019 the original author or authors. * Copyright 2019-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -482,7 +482,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
@Bean @Bean
public Consumer<String> imperativeConsumer() { public Consumer<String> imperativeConsumer() {
return null; return System.out::println;
} }
@Bean @Bean