From 92468bcd53d23ca501385a1bfd0dfbe06426bd7a Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Sat, 10 Apr 2021 08:10:23 +0200
Subject: [PATCH] Merge additional test to ensure propper type conversion

---
 .../BeanFactoryAwareFunctionRegistryTests.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
index e7079ae03..0b725f06d 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
@@ -565,7 +565,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
 
 	@Test
 	public void testGH_608_C() {
-		ApplicationContext context = new SpringApplicationBuilder(MessageFunctionConfiguration.class)
+		ApplicationContext context = new SpringApplicationBuilder(SampleFunctionConfiguration.class)
 			.run("--logging.level.org.springframework.cloud.function=DEBUG",
 				"--spring.main.lazy-initialization=true");
 		FunctionCatalog catalog = context.getBean(FunctionCatalog.class);
@@ -836,11 +836,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
 				}
 			};
 		}
-
-		@Bean
-		public Function<Flux<Message<Event<String, Person>>>, Flux<String>> echoGenericObjectFlux() {
-			return x -> x.map(eventMessage -> eventMessage.getPayload().getData().getName());
-		}
 	}
 
 	@EnableAutoConfiguration
@@ -849,6 +844,11 @@ public class BeanFactoryAwareFunctionRegistryTests {
 
 		AtomicReference<Object> consumerInputRef = new AtomicReference<>();
 
+		@Bean
+		public Function<Flux<Message<Event<String, Person>>>, Flux<String>> echoGenericObjectFlux() {
+			return x -> x.map(eventMessage -> eventMessage.getPayload().getData().getName());
+		}
+
 		@Bean
 		public Function<Person, Person> uppercasePerson() {
 			return person -> {