From 271bc2296975becb95efa0ca83d3c1bdeb118bcd Mon Sep 17 00:00:00 2001 From: Mingyuan Wu Date: Sun, 6 Dec 2020 16:41:31 +0800 Subject: [PATCH] Disconnect FunctionInspector from AbstractComposableFunctionRegistry and SimpleFunctionRegistry --- .../catalog/AbstractComposableFunctionRegistry.java | 4 ++-- .../function/context/catalog/SimpleFunctionRegistry.java | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java index c1702d522..f0b934c9f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java @@ -63,7 +63,7 @@ import org.springframework.util.StringUtils; * */ public abstract class AbstractComposableFunctionRegistry implements FunctionRegistry, - FunctionInspector, ApplicationEventPublisherAware, EnvironmentAware { + ApplicationEventPublisherAware, EnvironmentAware { private final Map functions = new ConcurrentHashMap<>(); @@ -170,7 +170,7 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi this.environment = environment; } - @Override + public FunctionRegistration getRegistration(Object function) { String functionName = function == null ? null : this.lookupFunctionName(function); diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 4de0bbf58..27d88d790 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -77,7 +77,7 @@ import org.springframework.util.StringUtils; * @author Oleg Zhurakousky * */ -public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspector { +public class SimpleFunctionRegistry implements FunctionRegistry { protected Log logger = LogFactory.getLog(this.getClass()); /* * - do we care about FunctionRegistration after it's been registered? What additional value does it bring? @@ -133,13 +133,6 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect return (T) function; } - @Override - public FunctionRegistration getRegistration(Object function) { - throw new UnsupportedOperationException("FunctionInspector is deprecated. There is no need " - + "to access FunctionRegistration directly since you can interogate the actual " - + "looked-up function (see FunctionInvocationWrapper."); - } - @Override public void register(FunctionRegistration registration) { Assert.notNull(registration, "'registration' must not be null");