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

GH-1213 Fix regression related to removal of TypeTools

Browse Source 
Resolves #1213
This commit is contained in:
Oleg Zhurakousky
2024-12-09 17:41:45 +01:00
parent cf9b0a3f9e
commit 622cbdabd7
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ package org.springframework.cloud.function.context.catalog;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@@ -27,6 +26,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.DoubleFunction;
@@ -42,6 +43,7 @@ import java.util.function.Supplier;
import java.util.function.ToDoubleFunction;
import java.util.function.ToIntFunction;
import java.util.function.ToLongFunction;
import java.util.stream.Stream;
import com.fasterxml.jackson.databind.JsonNode;
import kotlin.jvm.functions.Function0;
@@ -179,18 +181,28 @@ public final class FunctionTypeUtils {
* @return functional method
*/
public static Method discoverFunctionalMethod(Class<?> pojoFunctionClass) {
if (Supplier.class.isAssignableFrom(pojoFunctionClass)) {
return Stream.of(ReflectionUtils.getAllDeclaredMethods(pojoFunctionClass)).filter(m -> !m.isSynthetic()
&& m.getName().equals("get")).findFirst().get();
}
else if (Consumer.class.isAssignableFrom(pojoFunctionClass) || BiConsumer.class.isAssignableFrom(pojoFunctionClass)) {
return Stream.of(ReflectionUtils.getAllDeclaredMethods(pojoFunctionClass)).filter(m -> !m.isSynthetic()
&& m.getName().equals("accept")).findFirst().get();
}
else if (Function.class.isAssignableFrom(pojoFunctionClass) || BiFunction.class.isAssignableFrom(pojoFunctionClass)) {
return Stream.of(ReflectionUtils.getAllDeclaredMethods(pojoFunctionClass)).filter(m -> !m.isSynthetic()
&& m.getName().equals("apply")).findFirst().get();
}
List<Method> methods = new ArrayList<>();
ReflectionUtils.doWithMethods(pojoFunctionClass, method -> {
if (method.getDeclaringClass() == pojoFunctionClass
&& ((method.getParameterCount() == 1))
|| (method.getParameterCount() == 2 && method.getReturnType() != null)
|| (method.getParameterCount() == 0 && method.getReturnType() != null)) {
if (method.getDeclaringClass() == pojoFunctionClass) {
methods.add(method);
}
}, method ->
!method.getDeclaringClass().isAssignableFrom(Object.class)
&& !Modifier.isStatic(method.getModifiers()) && !method.isSynthetic() && !method.isBridge() && !method.isVarArgs());
&& !method.isSynthetic() && !method.isBridge() && !method.isVarArgs());
if (methods.size() > 1) {
for (Method candidadteMethod : methods) {

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

@@ -17,6 +17,7 @@
package org.springframework.cloud.function.context.catalog;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.List;
@@ -56,6 +57,12 @@ import static org.assertj.core.api.Assertions.assertThat;
@SuppressWarnings("unused")
public class FunctionTypeUtilsTests {
@Test
public void testDiscoverFunctionalMethod() throws Exception {
Method method = FunctionTypeUtils.discoverFunctionalMethod(SampleEventConsumer.class);
assertThat(method.getName()).isEqualTo("accept");
}
@Test
public void testFunctionTypeFrom() throws Exception {
Type type = FunctionTypeUtils.discoverFunctionTypeFromClass(SimpleConsumer.class);
@@ -292,4 +299,29 @@ public class FunctionTypeUtilsTests {
return inFlux.map(v -> Integer.parseInt(v));
}
}
public static abstract class AbstractConsumer<C> implements Consumer<Message<C>> {
@Override
public final void accept(Message<C> message) {
if (message == null) {
return;
}
doAccept(message.getPayload());
}
protected abstract void doAccept(C payload);
}
public static class SampleEventConsumer extends AbstractConsumer<SampleData> {
@Override
protected void doAccept(SampleData data) {
}
}
public static class SampleData {
}
}