Provide implementation of BeanFactoryNativeConfigurationProcessor for function types

Add initial implementation of FunctionTypeProcessor and FunctionTypeProcessorTests
Modified samples to remove TypeHint as well as reference to it in the README
Upgrade Spring Cloud dependency to 2021.0.0

Author: olegz

pom.xml

@@ -15,7 +15,7 @@
 		<graalvm.version>21.3.0</graalvm.version>
 		<docs.resources.version>0.2.1.RELEASE</docs.resources.version>
 		<spring.boot.version>2.6.1</spring.boot.version>
-		<spring.cloud.version>2021.0.0-RC1</spring.cloud.version>
+		<spring.cloud.version>2021.0.0</spring.cloud.version>
 		<spring.security.authorization-server.version>0.1.0</spring.security.authorization-server.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>11</java.version>

samples/cloud-function-aws/README.md

@@ -26,8 +26,6 @@ $> ./build.sh
 
 ```
 
->>NOTE: You will notice we apply `@TypeHint(types = {Person.class}` (see `DemoApplication`). Given that JSON converter will apply reflection to serialize/de-serialize `Person` type for the function input we need to provide minimal reflection configuration and `@TypeHint` will let us do just that.
-
 ### Deploy and test
 
 - Navigate to AWS Lambda dashboard and create a new function (name it anyway you want).

samples/cloud-function-aws/src/main/java/com/example/demo/DemoApplication.java

@@ -2,16 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.nativex.hint.TypeHint;
 
-import com.example.demo.domain.Person;
-
-@TypeHint(types = {Person.class})
 @SpringBootApplication
 public class DemoApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(DemoApplication.class, args);
 	}
-
 }

samples/cloud-function-netty-fun/result.txt

@@ -0,0 +1 @@
+

spring-aot/pom.xml

@@ -90,6 +90,11 @@
 			<artifactId>kafka-avro-serializer</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-function-context</artifactId>
+			<optional>true</optional>
+		</dependency>
 
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>

spring-aot/src/main/java/org/springframework/cloud/function/FunctionTypeProcessor.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function;
+
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanFactoryNativeConfigurationProcessor;
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeConfigurationRegistry;
+import org.springframework.aot.support.BeanFactoryProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
+import org.springframework.nativex.hint.TypeAccess;
+
+/**
+ * Ensures that Function/Consumer input types declared b the user are reflectively available.
+ *
+ * @author Oleg Zhurakousky
+ *
+ */
+public class FunctionTypeProcessor implements BeanFactoryNativeConfigurationProcessor {
+
+	@Override
+	public void process(ConfigurableListableBeanFactory beanFactory,
+			NativeConfigurationRegistry registry) {
+		new Processor().process(beanFactory, registry);
+	}
+
+	private static class Processor {
+
+		void process(ConfigurableListableBeanFactory beanFactory, NativeConfigurationRegistry registry) {
+			final Set<String> added = new HashSet<>();
+			new BeanFactoryProcessor(beanFactory).processBeans(this::isFunction,
+				(beanName, functionBeanType) -> {
+					Type functionType = FunctionTypeUtils.discoverFunctionTypeFromClass(functionBeanType);
+					Type inputType = FunctionTypeUtils.getInputType(functionType);
+					String name = inputType.getTypeName();
+					if (!name.startsWith("java.") &&
+						!name.startsWith("javax.")) {
+						if (added.add(name)) {
+							registry.reflection().forType(FunctionTypeUtils.getRawType(inputType))
+								.withAccess(TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_FIELDS, TypeAccess.PUBLIC_FIELDS, TypeAccess.DECLARED_METHODS, TypeAccess.PUBLIC_METHODS);
+						}
+					}
+				});
+		}
+
+		private boolean isFunction(Class<?> beanType) {
+			return Function.class.isAssignableFrom(beanType)
+					|| Consumer.class.isAssignableFrom(beanType);
+			// we don't care about Suppliers since it's output type is handled by the user code.
+		}
+	}
+
+}

spring-aot/src/main/resources/META-INF/spring.factories

@@ -29,7 +29,8 @@ org.springframework.kafka.KafkaAvroNativeConfigurationProcessor,\
 org.springframework.validation.annotation.ValidatedNativeConfigurationProcessor,\
 org.springframework.web.WebNativeConfigurationProcessor,\
 org.springframework.core.SynthesizedAnnotationNativeConfigurationProcessor,\
-org.springframework.core.IndexedBeanHierarchyNativeConfigurationProcessor
+org.springframework.core.IndexedBeanHierarchyNativeConfigurationProcessor,\
+org.springframework.cloud.function.FunctionTypeProcessor
 
 org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanNativeConfigurationProcessor=\
 org.springframework.aot.context.bootstrap.generator.nativex.DefaultBeanNativeConfigurationProcessor,\

spring-aot/src/test/java/org/springframework/cloud/function/FunctionTypeProcessorTests.java

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeConfigurationRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.nativex.domain.reflect.ClassDescriptor;
+import org.springframework.nativex.hint.TypeAccess;
+
+/**
+ *
+ * @author Oleg Zhurakousky
+ *
+ */
+class FunctionTypeProcessorTests {
+
+	private static Set<TypeAccess> ALL_MEMBERS;
+	{
+		ALL_MEMBERS = new HashSet<>(Arrays.asList(TypeAccess.PUBLIC_FIELDS, TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_METHODS, TypeAccess.PUBLIC_METHODS));
+	}
+
+	@Test
+	void testFunctionTypes() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("sampleFunction", BeanDefinitionBuilder.rootBeanDefinition(MyFunction.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		List<ClassDescriptor> classDescriptors = registry.reflection().toClassDescriptors();
+		assertThat(classDescriptors).hasSize(1);
+		ClassDescriptor cd = classDescriptors.get(0);
+		assertThat(cd.getName()).isEqualTo(Person.class.getName());
+		assertThat(cd.getAccess()).containsAll(ALL_MEMBERS);
+	}
+
+	@Test
+	void testConsumerTypes() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("sampleConsumer", BeanDefinitionBuilder.rootBeanDefinition(MyConsumer.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		List<ClassDescriptor> classDescriptors = registry.reflection().toClassDescriptors();
+		assertThat(classDescriptors).hasSize(1);
+		ClassDescriptor cd = classDescriptors.get(0);
+		assertThat(cd.getName()).isEqualTo(Person.class.getName());
+		assertThat(cd.getAccess()).containsAll(ALL_MEMBERS);
+	}
+
+	@Test
+	void testSupplierTypes() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("sampleSupplier", BeanDefinitionBuilder.rootBeanDefinition(MySupplier.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		List<ClassDescriptor> classDescriptors = registry.reflection().toClassDescriptors();
+		assertThat(classDescriptors).hasSize(0);
+	}
+
+	private NativeConfigurationRegistry process(DefaultListableBeanFactory beanFactory) {
+		NativeConfigurationRegistry registry = new NativeConfigurationRegistry();
+		new FunctionTypeProcessor().process(beanFactory, registry);
+		return registry;
+	}
+
+	public static class MyFunction implements Function<Person, String> {
+		@Override
+		public String apply(Person t) {
+			return null;
+		}
+	}
+
+	public static class MyConsumer implements Consumer<Person> {
+		@Override
+		public void accept(Person t) {
+		}
+	}
+
+	public static class MySupplier implements Supplier<Person> {
+		@Override
+		public Person get() {
+			return null;
+		}
+	}
+
+	public static class Person {
+		private String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+}