Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add JavaVersion.TWENTY

Browse Source 
Closes gh-35758
This commit is contained in:
Moritz Halbritter
2023-06-06 17:06:56 +02:00
parent be72e482ac
commit 2927d50d18
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import org.springframework.util.ClassUtils;
*
* @author Oliver Gierke
* @author Phillip Webb
* @author Moritz Halbritter
* @since 2.0.0
*/
public enum JavaVersion {
@@ -95,7 +96,12 @@ public enum JavaVersion {
/**
* Java 19.
*/
NINETEEN("19", Future.class, "state");
NINETEEN("19", Future.class, "state"),
/**
* Java 20.
*/
TWENTY("20", Class.class, "accessFlags");
private final String name;

12
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -152,8 +152,18 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
}
@Test
@EnabledIf("java20")
void currentJavaVersionTwenty() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY);
}
static boolean java19() {
return "19".equals(System.getProperty("java.version"));
}
static boolean java20() {
return System.getProperty("java.version").startsWith("20");
}
}