From cc442c5c0d5676c3a6eb503b75242c90eadeefc1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 21 Sep 2020 23:18:02 -0700 Subject: [PATCH] Make HandlerFunctionDescription JDK 15 compatible Update `HandlerFunctionDescription` so that it will work with JDK 15. Closes gh-23442 --- .../web/mappings/reactive/HandlerFunctionDescription.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java index 044e27da9c3..f035951338b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java @@ -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() {