Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add EIGHTEEN to JavaVersion

Browse Source 
Closes gh-29524
This commit is contained in:
Andy Wilkinson 2022-03-09 14:26:19 +00:00
parent 20d21d4e58
commit 314acd3407
2 changed files with 34 additions and 3 deletions
Show Stats 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-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -18,6 +18,7 @@ package org.springframework.boot.system;
import java.io.Console;
import java.lang.invoke.MethodHandles;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -83,7 +84,12 @@ public enum JavaVersion {
/**
* Java 17.
*/
SEVENTEEN("17", Console.class, "charset");
SEVENTEEN("17", Console.class, "charset"),
/**
* Java 18.
*/
EIGHTEEN("18", Duration.class, "isPositive");
private final String name;

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -16,9 +16,13 @@
package org.springframework.boot.system;
import java.lang.reflect.Method;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.junit.platform.commons.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
@ -139,4 +143,25 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SEVENTEEN);
}
@Test
@EnabledIf(value = "isJava18")
void currentJavaVersionEighteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
}
boolean isJava18() throws Exception {
// Same detection mechanism as org.junit.jupiter.api.condition.JRE
// which does not have a JAVA_18 constant in JUnit 5.7.x
try {
Method versionMethod = Runtime.class.getMethod("version");
Object version = ReflectionUtils.invokeMethod(versionMethod, null);
Method majorMethod = version.getClass().getMethod("major");
int major = (int) ReflectionUtils.invokeMethod(majorMethod, version);
return major == 18;
}
catch (Exception ex) {
return false;
}
}
}