From b1fa949dd930d42a3fdf17803554ba761daf3c61 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 6 Feb 2019 19:08:44 +0100
Subject: [PATCH] More polishing in ContextFunctionCatalog

---
 ...ntextFunctionCatalogAutoConfiguration.java | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
index d6987f3cc..8325ed30e 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
@@ -283,7 +283,7 @@ public class ContextFunctionCatalogAutoConfiguration {
 				return function;
 			}
 			else {
-				logger.warn("The resulting composition is is of type "
+				logger.warn("The resulting composition is of type "
 						+ types.get(normalizeName(name)));
 			}
 			return null;
@@ -490,25 +490,23 @@ public class ContextFunctionCatalogAutoConfiguration {
 
 		private FunctionType findType(Object function) {
 			String name = this.names.get(function);
+			FunctionType functionType;
 			if (this.types.containsKey(name)) {
-				return this.types.get(name);
-			}
-			FunctionType param;
-			if (name == null || this.beanFactory == null
-					|| !this.beanFactory.containsBeanDefinition(name)) {
-				if (function != null) {
-					param = new FunctionType(function.getClass());
-				}
-				else {
-					param = FunctionType.UNCLASSIFIED;
-				}
+				functionType = this.types.get(name);
 			}
 			else {
-				param = new FunctionType(
-						FunctionContextUtils.findType(name, this.beanFactory));
+				functionType = functionByNameExist(name)
+						? new FunctionType(function.getClass()) : new FunctionType(
+								FunctionContextUtils.findType(name, this.beanFactory));
+				this.types.computeIfAbsent(name, str -> functionType);
 			}
-			this.types.computeIfAbsent(name, str -> param);
-			return param;
+
+			return functionType;
+		}
+
+		private boolean functionByNameExist(String name) {
+			return name == null || this.beanFactory == null
+					|| !this.beanFactory.containsBeanDefinition(name);
 		}
 
 		@SuppressWarnings("rawtypes")