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

DATACMNS-1376 - Polishing.

Browse Source 
Moved JVM version lookup into Version.

Original pull request: #307.
This commit is contained in:
Oliver Gierke
2018-08-17 13:07:48 +02:00
parent 0d39693c94
commit f00d5b9ac6
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/util/Version.java
View File

@@ -87,6 +87,15 @@ public class Version implements Comparable<Version> {
return new Version(intParts);
}
/**
* Returns the Java version of the running JVM.
*
* @return will never be {@literal null}.
*/
public static Version javaVersion() {
return parse(System.getProperty("java.version"));
}
/**
* Returns whether the current {@link Version} is greater (newer) than the given one.
*

9
src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java
View File

@@ -26,15 +26,14 @@ import org.springframework.data.util.Version;
* Unit tests for {@link DefaultMethodInvokingMethodInterceptor}.
*
* @author Mark Paluch
* @author Oliver Gierke
*/
public class DefaultMethodInvokingMethodInterceptorUnitTests {
@Test // DATACMNS-1376
public void shouldApplyEncapsulatedLookupOnJava9AndHigher() {
Version version = Version.parse(System.getProperty("java.version"));
assumeTrue(version.isGreaterThanOrEqualTo(Version.parse("9.0")));
assumeTrue(Version.javaVersion().isGreaterThanOrEqualTo(Version.parse("9.0")));
assertThat(MethodHandleLookup.getMethodHandleLookup()).isEqualTo(MethodHandleLookup.ENCAPSULATED);
assertThat(MethodHandleLookup.ENCAPSULATED.isAvailable()).isTrue();
@@ -43,9 +42,7 @@ public class DefaultMethodInvokingMethodInterceptorUnitTests {
@Test // DATACMNS-1376
public void shouldApplyOpenLookupOnJava8() {
Version version = Version.parse(System.getProperty("java.version"));
assumeTrue(version.isLessThan(Version.parse("1.8.9999")));
assumeTrue(Version.javaVersion().isLessThan(Version.parse("1.8.9999")));
assertThat(MethodHandleLookup.getMethodHandleLookup()).isEqualTo(MethodHandleLookup.OPEN);
assertThat(MethodHandleLookup.OPEN.isAvailable()).isTrue();