From f00d5b9ac6be77dafbfb5a325ce21b7b48e19904 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 17 Aug 2018 13:07:48 +0200 Subject: [PATCH] DATACMNS-1376 - Polishing. Moved JVM version lookup into Version. Original pull request: #307. --- src/main/java/org/springframework/data/util/Version.java | 9 +++++++++ .../DefaultMethodInvokingMethodInterceptorUnitTests.java | 9 +++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/util/Version.java b/src/main/java/org/springframework/data/util/Version.java index 1093bce42..10793aba7 100644 --- a/src/main/java/org/springframework/data/util/Version.java +++ b/src/main/java/org/springframework/data/util/Version.java @@ -87,6 +87,15 @@ public class Version implements Comparable { 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. * diff --git a/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java index 70d5335f6..c8b7ceb97 100644 --- a/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java @@ -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();