From ca16797791f0504d2144cea7e8e50de668ea7537 Mon Sep 17 00:00:00 2001
From: onobc <chris.bono@gmail.com>
Date: Sat, 12 Feb 2022 10:24:22 -0600
Subject: [PATCH] Remove FunctionType from docs and AWS sample

Resolves #808
---
 docs/src/main/asciidoc/adapters/aws.adoc                 | 2 +-
 docs/src/main/asciidoc/functional.adoc                   | 2 +-
 .../src/main/java/example/FunctionConfiguration.java     | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/src/main/asciidoc/adapters/aws.adoc b/docs/src/main/asciidoc/adapters/aws.adoc
index 39d4bc9f2..fb0c51131 100644
--- a/docs/src/main/asciidoc/adapters/aws.adoc
+++ b/docs/src/main/asciidoc/adapters/aws.adoc
@@ -31,7 +31,7 @@ public class FuncApplication implements ApplicationContextInitializer<GenericApp
 	public void initialize(GenericApplicationContext context) {
 		context.registerBean("function", FunctionRegistration.class,
 			() -> new FunctionRegistration<Function<Foo, Bar>>(function())
-				.type(FunctionType.from(Foo.class).to(Bar.class).getType()));
+                .type(FunctionTypeUtils.functionType(Foo.class, Bar.class)));
 	}
 
 }
diff --git a/docs/src/main/asciidoc/functional.adoc b/docs/src/main/asciidoc/functional.adoc
index 38100f4ae..a12f520ac 100644
--- a/docs/src/main/asciidoc/functional.adoc
+++ b/docs/src/main/asciidoc/functional.adoc
@@ -40,7 +40,7 @@ public class DemoApplication implements ApplicationContextInitializer<GenericApp
   public void initialize(GenericApplicationContext context) {
     context.registerBean("demo", FunctionRegistration.class,
         () -> new FunctionRegistration<>(uppercase())
-            .type(FunctionType.from(String.class).to(String.class)));
+            .type(FunctionTypeUtils.functionType(String.class, String.class)));
   }
 
 }
diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java
index 9aa1eea0c..554133da0 100644
--- a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java
+++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java
@@ -5,12 +5,9 @@ import java.util.function.Function;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.function.context.FunctionRegistration;
-import org.springframework.cloud.function.context.FunctionType;
 import org.springframework.cloud.function.context.MessageRoutingCallback;
-import org.springframework.cloud.function.context.MessageRoutingCallback.FunctionRoutingResult;
-import org.springframework.cloud.function.json.JsonMapper;
+import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
 import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.messaging.Message;
 
@@ -51,9 +48,9 @@ public class FunctionConfiguration implements ApplicationContextInitializer<Gene
 				() -> new RoutingCallback());
 		applicationContext.registerBean("uppercase", FunctionRegistration.class,
                 () -> new FunctionRegistration<>(uppercase()).type(
-                        FunctionType.from(String.class).to(String.class)));
+					FunctionTypeUtils.functionType(String.class, String.class)));
 		applicationContext.registerBean("reverse", FunctionRegistration.class,
                 () -> new FunctionRegistration<>(reverse()).type(
-                        FunctionType.from(String.class).to(String.class)));
+                        FunctionTypeUtils.functionType(String.class, String.class)));
 	}
 }