diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index f1e56b614f4..ea552f0316d 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz" ;; java15) - echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-2020-05-26-19-22/OpenJDK-jdk_x64_linux_hotspot_2020-05-26-11-00.tar.gz" + echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15-2020-06-15-05-34/OpenJDK15-jdk_x64_linux_hotspot_2020-06-15-05-34.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index a439a36e7b2..6f497eef9aa 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -402,7 +402,7 @@ jobs: params: { state: "success", commit: "git-repo" } - put: slack-alert params: - <<: *slack-success-params + <<: *slack-success-params - name: jdk15-build serial: true public: true diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index f5715c9a64c..8921784dd8b 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -15,7 +15,7 @@ case "$JDK_VERSION" in ;; java15) BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea" - ISSUE_TITLE="Upgrade Java 14 version in CI image" + ISSUE_TITLE="Upgrade Java 15 version in CI image" ;; *) echo $"Unknown java version" 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 f4ecb17d084..694e69a98ad 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 @@ -32,14 +32,14 @@ public class HandlerFunctionDescription { 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() { return this.className; } - private String getHandlerFunctionClassName(HandlerFunction handlerFunction) { - Class functionClass = handlerFunction.getClass(); - String canonicalName = functionClass.getCanonicalName(); - return canonicalName != null ? canonicalName : functionClass.getName(); - } - }