From 76e3bf29574035532b406c54b70be2138fffb80a Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Tue, 18 Sep 2018 13:21:58 +0200
Subject: [PATCH] polishing/refactoring

Undeprecated deprecated constructor in FunctionRegistration
Made FunctionRegistration BeanNameAware
Added name assertion in FunctionRegistrationPostProcessor
---
 .../context/FunctionRegistration.java         | 24 +++++++++----------
 .../ContextFunctionCatalogInitializer.java    |  5 ++--
 2 files changed, 13 insertions(+), 16 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 3bab41e8c..03f5a0899 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
@@ -27,10 +27,12 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.cloud.function.core.FluxConsumer;
 import org.springframework.cloud.function.core.FluxFunction;
 import org.springframework.cloud.function.core.FluxSupplier;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -39,7 +41,7 @@ import reactor.core.publisher.Mono;
  * @author Dave Syer
  * @author Oleg Zhurakousky
  */
-public class FunctionRegistration<T> {
+public class FunctionRegistration<T> implements BeanNameAware {
 
 	private T target;
 
@@ -49,16 +51,6 @@ public class FunctionRegistration<T> {
 
 	private FunctionType type;
 
-	/**
-	 * @deprecated as of v1.0.0 in favor of
-	 * {@link #FunctionRegistration(Object, String...)}
-	 */
-	@Deprecated
-	public FunctionRegistration(T target) {
-		Assert.notNull(target, "'target' must not be null");
-		this.target = target;
-	}
-
 	/**
 	 * Creates instance of FunctionRegistration.
 	 *
@@ -68,7 +60,6 @@ public class FunctionRegistration<T> {
 	 */
 	public FunctionRegistration(T target, String... names) {
 		Assert.notNull(target, "'target' must not be null");
-		Assert.notEmpty(names, "'names' must not be null or empty");
 		this.target = target;
 		this.names(names);
 	}
@@ -171,5 +162,12 @@ public class FunctionRegistration<T> {
 		}
 		return result.target(target).names(this.names).properties(this.properties);
 	}
-	
+
+	@Override
+	public void setBeanName(String name) {
+		if (CollectionUtils.isEmpty(this.names)) {
+			this.name(name);
+		}
+	}
+
 }
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
index 7872d6193..122bc0635 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
@@ -38,6 +38,7 @@ import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.format.support.DefaultFormattingConversionService;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -175,9 +176,7 @@ public class ContextFunctionCatalogInitializer
 					throws BeansException {
 				if (bean instanceof FunctionRegistration) {
 					FunctionRegistration<?> registration = (FunctionRegistration<?>) bean;
-					if (registration.getNames().isEmpty()) {
-						registration = registration.name(beanName);
-					}
+					Assert.notEmpty(registration.getNames(), "FunctionRegistration must define at least one name. Was empty");;
 					if (registration.getType() == null) {
 						throw new IllegalStateException(
 								"You need an explicit type for the function: "