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

Merge branch '2.2.x' into 2.3.x 

Closes gh-23444
This commit is contained in:
Phillip Webb 2020-09-21 23:20:10 -07:00
parent e12a449ed9 b443d22c59
commit 363d35a0ac
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,23 +9,23 @@ trap 'report_error $? $LINENO' ERR
case "$JDK_VERSION" in case "$JDK_VERSION" in
java8) java8)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8/ga"
ISSUE_TITLE="Upgrade Java 8 version in CI image" ISSUE_TITLE="Upgrade Java 8 version in CI image"
;; ;;
java11) java11)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga"
ISSUE_TITLE="Upgrade Java 11 version in CI image" ISSUE_TITLE="Upgrade Java 11 version in CI image"
;; ;;
java14) java15)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
ISSUE_TITLE="Upgrade Java 14 version in CI image" ISSUE_TITLE="Upgrade Java 15 version in CI image"
;; ;;
*) *)
echo $"Unknown java version" echo $"Unknown java version"
exit 1; exit 1;
esac esac
response=$( curl -s ${BASE_URL}\/ga\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk ) response=$( curl -s ${BASE_URL}\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" ) latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" )
if [[ ${latest} = "null" || ${latest} = "" ]]; then if [[ ${latest} = "null" || ${latest} = "" ]]; then
echo "Could not parse JDK response: $response" echo "Could not parse JDK response: $response"

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

@ -29,7 +29,13 @@ public class HandlerFunctionDescription {
private final String className; private final String className;
HandlerFunctionDescription(HandlerFunction<?> handlerFunction) { 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() { public String getClassName() {