mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.2.x' into 2.3.x
Closes gh-23444
This commit is contained in:
commit
363d35a0ac
@ -9,23 +9,23 @@ trap 'report_error $? $LINENO' ERR
|
||||
|
||||
case "$JDK_VERSION" in
|
||||
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"
|
||||
;;
|
||||
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"
|
||||
;;
|
||||
java14)
|
||||
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14"
|
||||
ISSUE_TITLE="Upgrade Java 14 version in CI image"
|
||||
java15)
|
||||
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
|
||||
ISSUE_TITLE="Upgrade Java 15 version in CI image"
|
||||
;;
|
||||
*)
|
||||
echo $"Unknown java version"
|
||||
exit 1;
|
||||
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" )
|
||||
if [[ ${latest} = "null" || ${latest} = "" ]]; then
|
||||
echo "Could not parse JDK response: $response"
|
||||
|
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user