From 3c91914f82bfd4730ec2f7fa9fdbb1aef96af32f Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 17 Sep 2018 15:21:40 +0100
Subject: [PATCH] Purge some more deprecated constructor usages

---
 .../cloud/function/context/FunctionRegistration.java          | 2 +-
 .../function/context/catalog/InMemoryFunctionCatalog.java     | 1 -
 .../config/ContextFunctionCatalogInitializerTests.java        | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
index def633e8b..3bab41e8c 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionRegistration.java
@@ -171,5 +171,5 @@ public class FunctionRegistration<T> {
 		}
 		return result.target(target).names(this.names).properties(this.properties);
 	}
-
+	
 }
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/InMemoryFunctionCatalog.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/InMemoryFunctionCatalog.java
index f31875f0e..bfb8a120a 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/InMemoryFunctionCatalog.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/InMemoryFunctionCatalog.java
@@ -19,7 +19,6 @@ package org.springframework.cloud.function.context.catalog;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java
index 337faa73a..d56434205 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java
@@ -271,8 +271,8 @@ public class ContextFunctionCatalogInitializerTests {
 		public void initialize(GenericApplicationContext context) {
 			context.registerBean("foos", FunctionConfiguration.class, () -> this);
 			context.registerBean("function", FunctionRegistration.class,
-					() -> new FunctionRegistration<>(this)
-							.type(FunctionConfiguration.class).name("foos"));
+					() -> new FunctionRegistration<>(this, "foos")
+							.type(FunctionConfiguration.class));
 		}
 
 		@Override