From 14b47350cfe48e3dfb44bcd7fe788690e9e2bc41 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 20 Sep 2022 18:44:41 +0200
Subject: [PATCH] Polishing the last commit

---
 .../cloud/function/context/config/FunctionContextUtils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java
index 7d4836dcb..9a0acd3e2 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java
@@ -77,10 +77,10 @@ public abstract class FunctionContextUtils {
 		}
 		else {
 			Type t = definition.getResolvableType().getType();
-			if (t instanceof ParameterizedType) {
-				return t;
+			if (!(t instanceof ParameterizedType) && definition.hasBeanClass()) {
+				return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass());
 			}
-			return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass());
+			return param;
 		}
 	}