From 612d54ba537228b65cd1a8563b9ff460e99a9855 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 21 Sep 2020 17:24:52 +0200 Subject: [PATCH] Remove commented code --- .../context/catalog/FunctionInspector.java | 5 ----- .../context/catalog/SimpleFunctionRegistry.java | 16 ++-------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionInspector.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionInspector.java index 62627f395..139c5ee87 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionInspector.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionInspector.java @@ -32,11 +32,6 @@ public interface FunctionInspector { default boolean isMessage(Object function) { FunctionRegistration registration = getRegistration(function); -// if (registration != null && registration.getTarget() instanceof FunctionInvocationWrapper -// && ((FunctionInvocationWrapper) registration.getTarget()).getTarget() instanceof RoutingFunction) { -// // we always want to give routing function as much information as possible -// return true; -// } if (registration != null && registration.getTarget() instanceof RoutingFunction) { return true; } 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 f7b25698e..9f57b9376 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 @@ -454,24 +454,12 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect @Override public int hashCode() { - if (this.delegate != null) { - return this.delegate.hashCode(); - } - else { - return this.target.hashCode(); - } - //return super.hashCode(); + return this.delegate == null ? this.target.hashCode() : this.delegate.hashCode(); } @Override public boolean equals(Object o) { - if (this.delegate != null) { - return this.delegate.equals(o); - } - else { - return this.target.equals(o); - } -// return super.equals(o); + return this.delegate == null ? this.target.equals(o) : this.delegate.equals(o); } public String getFunctionDefinition() {