Skip to content

Fixes gh-1098 Support primitive function interfaces #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fixes gh-1098 Support primitive function interfaces #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac455e
Fixes gh-1098 Support primitive function interfaces
k42ke Oct 26, 2024
6dddf31
gh-1098 Java's basic type
junggi7777 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions ...t/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,20 @@
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;
import java.util.function.DoubleSupplier;
import java.util.function.Function;
import java.util.function.IntConsumer;
import java.util.function.IntFunction;
import java.util.function.IntSupplier;
import java.util.function.LongConsumer;
import java.util.function.LongFunction;
import java.util.function.LongSupplier;
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;
Expand Down Expand Up @@ -540,10 +552,23 @@ private static void assertSupportedTypes(Type type) {
Class<?> candidateType = (Class<?>) type;

Assert.isTrue(Supplier.class.isAssignableFrom(candidateType)
|| Function.class.isAssignableFrom(candidateType)
|| Consumer.class.isAssignableFrom(candidateType)
|| FunctionRegistration.class.isAssignableFrom(candidateType)
|| type.getTypeName().startsWith("org.springframework.context.annotation.ConfigurationClassEnhancer"), "Must be one of Supplier, Function, Consumer"
|| Function.class.isAssignableFrom(candidateType)
|| Consumer.class.isAssignableFrom(candidateType)
|| FunctionRegistration.class.isAssignableFrom(candidateType)
|| IntConsumer.class.isAssignableFrom(candidateType)
|| IntSupplier.class.isAssignableFrom(candidateType)
|| IntFunction.class.isAssignableFrom(candidateType)
|| ToIntFunction.class.isAssignableFrom(candidateType)
|| LongConsumer.class.isAssignableFrom(candidateType)
|| LongSupplier.class.isAssignableFrom(candidateType)
|| LongFunction.class.isAssignableFrom(candidateType)
|| ToLongFunction.class.isAssignableFrom(candidateType)
|| DoubleConsumer.class.isAssignableFrom(candidateType)
|| DoubleSupplier.class.isAssignableFrom(candidateType)
|| DoubleFunction.class.isAssignableFrom(candidateType)
|| ToDoubleFunction.class.isAssignableFrom(candidateType)
|| type.getTypeName().startsWith("org.springframework.context.annotation.ConfigurationClassEnhancer"),
"Must be one of Supplier, Function, Consumer"
+ " or FunctionRegistration. Was " + type);
}

Expand Down
92 changes: 92 additions & 0 deletions .../test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,20 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.DoubleFunction;
import java.util.function.DoubleSupplier;
import java.util.function.Function;
import java.util.function.IntConsumer;
import java.util.function.IntFunction;
import java.util.function.IntSupplier;
import java.util.function.LongConsumer;
import java.util.function.LongFunction;
import java.util.function.LongSupplier;
import java.util.function.Supplier;
import java.util.function.ToDoubleFunction;
import java.util.function.ToIntFunction;
import java.util.function.ToLongFunction;

import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
Expand Down Expand Up @@ -113,6 +125,86 @@ public void testNoNpeFromIsMessage() {
assertThat(FunctionTypeUtils.isMessage(methodParameter.getGenericParameterType())).isFalse();
}

@Test
public void testPrimitiveFunctionInputTypes() {
Type type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(IntConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(IntSupplier.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(IntFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToIntFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(ToIntFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(LongConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(LongSupplier.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(LongFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToLongFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(ToLongFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(DoubleConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(DoubleSupplier.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(DoubleFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToDoubleFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getInputType(type))).isAssignableFrom(ToDoubleFunction.class);
}


@Test
public void testPrimitiveFunctionOutputTypes() {
Type type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(IntConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(IntSupplier.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(IntFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(IntFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToIntFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(ToIntFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(LongConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(LongSupplier.class);


type = FunctionTypeUtils.discoverFunctionTypeFromClass(LongFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(LongFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToLongFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(ToLongFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleConsumer.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(DoubleConsumer.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleSupplier.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(DoubleSupplier.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(DoubleFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(DoubleFunction.class);

type = FunctionTypeUtils.discoverFunctionTypeFromClass(ToDoubleFunction.class);
assertThat(FunctionTypeUtils.getRawType(FunctionTypeUtils.getOutputType(type))).isAssignableFrom(ToDoubleFunction.class);
}

void notAMessageMethod(AtomicReference<T> payload) {

}
Expand Down