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 18a0d358c5..1592c6b0ac 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 @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.stream.Stream; import org.springframework.util.ClassUtils; @@ -71,7 +72,12 @@ public enum JavaVersion { /** * Java 15. */ - FIFTEEN("15", CharSequence.class, "isEmpty"); + FIFTEEN("15", CharSequence.class, "isEmpty"), + + /** + * Java 16. + */ + SIXTEEN("16", Stream.class, "toList"); 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 539ad9b410..f464ecce1b 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 @@ -127,4 +127,10 @@ class JavaVersionTests { assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN); } + @Test + @EnabledOnJre(JRE.JAVA_16) + void currentJavaVersionSixteen() { + assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN); + } + }