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

Remove unnecessary parameters

Browse Source
This commit is contained in:
Dave Syer
2017-01-04 09:33:25 +00:00
parent 80408d2f77
commit 13774abe39
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -168,7 +168,7 @@ public class ContextFunctionCatalogAutoConfiguration {
} }
} }
abstract class ProxyWrapper<S, T> { abstract class ProxyWrapper<T> {
private ObjectMapper mapper; private ObjectMapper mapper;
@@ -176,7 +176,7 @@ abstract class ProxyWrapper<S, T> {
private String name; private String name;
private Class<S> type; private Class<?> type;
private BeanDefinitionRegistry registry; private BeanDefinitionRegistry registry;
@@ -200,26 +200,24 @@ abstract class ProxyWrapper<S, T> {
this.registry = registry; this.registry = registry;
} }
private Class<S> findType(RootBeanDefinition definition) { private Class<?> findType(RootBeanDefinition definition) {
StandardMethodMetadata source = (StandardMethodMetadata) definition.getSource(); StandardMethodMetadata source = (StandardMethodMetadata) definition.getSource();
ParameterizedType type = (ParameterizedType) (source.getIntrospectedMethod() ParameterizedType type = (ParameterizedType) (source.getIntrospectedMethod()
.getGenericReturnType()); .getGenericReturnType());
type = (ParameterizedType) type.getActualTypeArguments()[0]; type = (ParameterizedType) type.getActualTypeArguments()[0];
Type param = type.getActualTypeArguments()[0]; Type param = type.getActualTypeArguments()[0];
@SuppressWarnings("unchecked") return ClassUtils.resolveClassName(param.getTypeName(),
Class<S> resolved = (Class<S>) ClassUtils.resolveClassName(param.getTypeName(),
registry.getClass().getClassLoader()); registry.getClass().getClassLoader());
return resolved;
} }
public Class<S> getType() { public Class<?> getType() {
if (type == null) { if (type == null) {
type = findType((RootBeanDefinition) registry.getBeanDefinition(name)); type = findType((RootBeanDefinition) registry.getBeanDefinition(name));
} }
return type; return type;
} }
public S fromJson(String value) { public Object fromJson(String value) {
try { try {
return mapper.readValue(value, getType()); return mapper.readValue(value, getType());
} }
@@ -239,7 +237,7 @@ abstract class ProxyWrapper<S, T> {
} }
class ProxyFunction extends ProxyWrapper<Object, Function<Flux<Object>, Flux<Object>>> class ProxyFunction extends ProxyWrapper<Function<Flux<?>, Flux<?>>>
implements Function<Flux<String>, Flux<String>> { implements Function<Flux<String>, Flux<String>> {
@Autowired @Autowired
@@ -254,7 +252,7 @@ class ProxyFunction extends ProxyWrapper<Object, Function<Flux<Object>, Flux<Obj
} }
class ProxySupplier extends ProxyWrapper<Object, Supplier<Flux<Object>>> class ProxySupplier extends ProxyWrapper<Supplier<Flux<?>>>
implements Supplier<Flux<String>> { implements Supplier<Flux<String>> {
@Autowired @Autowired
@@ -269,7 +267,7 @@ class ProxySupplier extends ProxyWrapper<Object, Supplier<Flux<Object>>>
} }
class ProxyConsumer extends ProxyWrapper<Object, Consumer<Flux<Object>>> class ProxyConsumer extends ProxyWrapper<Consumer<Flux<?>>>
implements Consumer<Flux<String>> { implements Consumer<Flux<String>> {
@Autowired @Autowired