Merge branch '2.1.x' into 2.2.x

Closes gh-23443
This commit is contained in:
Phillip Webb 2020-09-21 23:19:41 -07:00
commit b443d22c59
1 changed files with 7 additions and 1 deletions

View File

@ -29,7 +29,13 @@ public class HandlerFunctionDescription {
private final String className;
HandlerFunctionDescription(HandlerFunction<?> handlerFunction) {
this.className = handlerFunction.getClass().getCanonicalName();
this.className = getHandlerFunctionClassName(handlerFunction);
}
private static String getHandlerFunctionClassName(HandlerFunction<?> handlerFunction) {
Class<?> functionClass = handlerFunction.getClass();
String canonicalName = functionClass.getCanonicalName();
return (canonicalName != null) ? canonicalName : functionClass.getName();
}
public String getClassName() {