root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Add Java 15 CI" 

See gh-21713
This commit is contained in:
Stephane Nicoll 2020-06-15 17:06:28 +02:00
parent 85218db222
commit e87c3193ce
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/get-jdk-url.sh
View File

@ -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"

2
ci/pipeline.yml
View File

@ -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

2
ci/scripts/detect-jdk-updates.sh
View File

@ -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"

12
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/HandlerFunctionDescription.java
View File

@ -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();
}
}