From 5ca7d2b9b06a203e81e2ff32d769137e6ad7706f Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 4 Jun 2020 07:26:04 +0200 Subject: [PATCH] Add Java 15 to JavaVersion enum --- .../java/org/springframework/boot/system/JavaVersion.java | 7 ++++++- .../org/springframework/boot/system/JavaVersionTests.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java index e6fcb3ed01ec..18a0d358c5c7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java @@ -66,7 +66,12 @@ public enum JavaVersion { /** * Java 14. */ - FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess"); + FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess"), + + /** + * Java 15. + */ + FIFTEEN("15", CharSequence.class, "isEmpty"); private final String name; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java index a2b03b429e25..539ad9b41034 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java @@ -121,4 +121,10 @@ void currentJavaVersionFourteen() { assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FOURTEEN); } + @Test + @EnabledOnJre(JRE.JAVA_15) + void currentJavaVersionFifteen() { + assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN); + } + }