Skip to content

Commit 4bb32e0

Browse files
jstouracjstourac
authored
[utils] Deprecation of some isJdk* methods with more suitable replaces. (#108)
Since in a near future we may run into a name collision of the `isJdk*` methods, this change proposes to deprecate methods with names that include old JDK version schema (1.6, 1.7, etc.) with introduction of alternatives using a new JDK version schema (7, 8, 9, etc.). This also introduces new method that recognizes currently latest java version - JDK15.
1 parent 5d6f355 commit 4bb32e0

File tree

2 files changed

+143
-54
lines changed

2 files changed

+143
-54
lines changed

‎core/src/main/groovy/noe/common/utils/Java.groovy‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,104 @@ public class Java {
4040
"${javaVersion} ${javaVendor} ${javaVmName} ${javaVmInfo}"
4141
}
4242

43+
/**
44+
* @deprecated since 0.17.2, please use {@link #isJdk6()} instead.
45+
* @return true if process is running on JDK 6 AKA JDK 1.6
46+
*/
4347
static boolean isJdk16() {
48+
return isJdk6()
49+
}
50+
51+
/**
52+
* @return true if process is running on JDK 6 AKA JDK 1.6
53+
*/
54+
static boolean isJdk6() {
4455
return (javaVersion ==~ /^1\.6.*/)
4556
}
4657

58+
/**
59+
* @deprecated since 0.17.2, please use {@link #isJdk7()} instead.
60+
* @return true if process is running on JDK 7 AKA JDK 1.7
61+
*/
4762
static boolean isJdk17() {
63+
return isJdk7()
64+
}
65+
66+
/**
67+
* @return true if process is running on JDK 7 AKA JDK 1.7
68+
*/
69+
static boolean isJdk7() {
4870
return (javaVersion ==~ /^1\.7.*/)
4971
}
5072

73+
/**
74+
* @deprecated since 0.17.2, please use {@link #isJdk8()} instead.
75+
* @return true if process is running on JDK 8 AKA JDK 1.8
76+
*/
5177
static boolean isJdk18() {
78+
return isJdk8()
79+
}
80+
81+
/**
82+
* @return true if process is running on JDK 8 AKA JDK 1.8
83+
*/
84+
static boolean isJdk8() {
5285
return (javaVersion ==~ /^1\.8.*/)
5386
}
5487

5588
/**
5689
* Relates to http://openjdk.java.net/jeps/223
5790
*
58-
* @return true if used Java is version 9
91+
* @deprecated since 0.17.2, please use {@link #isJdk9()} instead.
92+
* @return true if process is running on JDK 9
5993
*/
6094
static boolean isJdk19() {
95+
return isJdk9()
96+
}
97+
98+
/**
99+
* Relates to http://openjdk.java.net/jeps/223
100+
*
101+
* @return true if process is running on JDK 9
102+
*/
103+
static boolean isJdk9() {
61104
return (javaVersion ==~ /^9[\.\-\+].*/)
62105
}
63106

107+
/**
108+
* @return true if process is running on JDK 11
109+
*/
64110
static boolean isJdk11() {
65111
return (javaVersion ==~ /^11[\.\-\+].*/)
66112
}
67113

68114
/**
69-
* Are we running on minimumJDKVersion ?
115+
* @return true if process is running on JDK 15
116+
*/
117+
static boolean isJdk15() {
118+
return (javaVersion ==~ /^15[\.\-\+].*/)
119+
}
120+
121+
/**
122+
* Are we running on minimumJDKVersion ?. This accepts both legacy (1.6, 1.7, etc.)
123+
* Java version format and also new one (7, 8, 9, etc.).
70124
*
71125
* @param minimumJDKVersion JDK version (example: '1.7')
126+
* @deprecated since 0.17.2, please use {@link #isJdkXOrHigher(java.lang.String)} instead.
72127
* @return true if we are running on minimumJDKVersion or higher
73128
*/
74129
static boolean isJdk1xOrHigher(String minimumJDKVersion) {
130+
return isJdkXOrHigher(minimumJDKVersion)
131+
}
132+
133+
/**
134+
* Are we running on minimumJDKVersion ?. This accepts both legacy (1.6, 1.7, etc.)
135+
* Java version format and also new one (7, 8, 9, etc.).
136+
*
137+
* @param minimumJDKVersion JDK version (example: '1.7' or '7')
138+
* @return true if we are running on minimumJDKVersion or higher
139+
*/
140+
static boolean isJdkXOrHigher(String minimumJDKVersion) {
75141
int usedJavaMajorVersion
76142
int minimumJavaMajorVersion
77143

‎core/src/test/groovy/noe/common/utils/JavaTest.groovy‎

Lines changed: 75 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -27,67 +27,71 @@ class JavaTest {
2727
}
2828

2929
@Test
30-
void testIsJdk16() {
30+
void testIsJdk6() {
3131
List<String> testedStrings = new LinkedList<>()
3232
testedStrings.add("1.6.0")
3333
testedStrings.add("1.6.3")
3434

3535
for (String testedString : testedStrings) {
3636
setJavaVersion(testedString)
37-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk16())
38-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk17())
39-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk18())
40-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk19())
37+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk6())
38+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk7())
39+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk8())
40+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk9())
4141
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk11())
42+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk15())
4243
}
4344
}
4445

4546
@Test
46-
void testIsJdk17() {
47+
void testIsJdk7() {
4748
List<String> testedStrings = new LinkedList<>()
4849
testedStrings.add("1.7.0")
4950
testedStrings.add("1.7.3")
5051

5152
for (String testedString : testedStrings) {
5253
setJavaVersion(testedString)
53-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk17())
54-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk16())
55-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk18())
56-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk19())
54+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk7())
55+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk6())
56+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk8())
57+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk9())
5758
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk11())
59+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk15())
5860
}
5961
}
6062

6163
@Test
62-
void testIsJdk18() {
64+
void testIsJdk8() {
6365
List<String> testedStrings = new LinkedList<>()
6466
testedStrings.add("1.8.0")
6567
testedStrings.add("1.8.3")
6668

6769
for (String testedString : testedStrings) {
6870
setJavaVersion(testedString)
69-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk18())
70-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk16())
71-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk17())
72-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk19())
71+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk8())
72+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk6())
73+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk7())
74+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk9())
7375
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk11())
76+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk15())
7477
}
7578
}
7679

7780
@Test
78-
void testIsJdk19() {
81+
void testIsJdk9() {
7982
List<String> testedStrings = new LinkedList<>()
8083
testedStrings.add("9-ea")
8184
testedStrings.add("9.0.0")
8285
testedStrings.add("9.6.3")
8386

8487
for (String testedString : testedStrings) {
8588
setJavaVersion(testedString)
86-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk19())
87-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk16())
88-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk17())
89-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk18())
89+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk9())
90+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk6())
91+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk7())
92+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk8())
9093
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk11())
94+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk15())
9195
}
9296
}
9397

@@ -100,32 +104,51 @@ class JavaTest {
100104

101105
for (String testedString : testedStrings) {
102106
setJavaVersion(testedString)
103-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk19())
104-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk16())
105-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk17())
106-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk18())
107107
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk11())
108+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk9())
109+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk6())
110+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk7())
111+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk8())
112+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk15())
108113
}
109114
}
110115

111116
@Test
112-
void testIsJdk1xOrHigher() {
117+
void testIsJdk15() {
118+
List<String> testedStrings = new LinkedList<>()
119+
testedStrings.add("15.0.1")
120+
testedStrings.add("15.1.5")
121+
testedStrings.add("15-test")
122+
123+
for (String testedString : testedStrings) {
124+
setJavaVersion(testedString)
125+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk15())
126+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk6())
127+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk7())
128+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk8())
129+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk9())
130+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk11())
131+
}
132+
}
133+
134+
@Test
135+
void testIsJdkXOrHigher() {
113136
List<String> testedStrings = new LinkedList<>()
114137
testedStrings.add("9-ea")
115138
testedStrings.add("9.0.0")
116139
testedStrings.add("9.6.3")
117140

118141
for (String testedString : testedStrings) {
119142
setJavaVersion(testedString)
120-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.6"))
121-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.7"))
122-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.8"))
123-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("9"))
124-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.9"))
125-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("10"))
126-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.10"))
127-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("11"))
128-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.11"))
143+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.6"))
144+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.7"))
145+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.8"))
146+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("9"))
147+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.9"))
148+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("10"))
149+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.10"))
150+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("11"))
151+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.11"))
129152
}
130153

131154
testedStrings = new LinkedList<>()
@@ -134,15 +157,15 @@ class JavaTest {
134157

135158
for (String testedString : testedStrings) {
136159
setJavaVersion(testedString)
137-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.6"))
138-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.7"))
139-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.8"))
140-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("9"))
141-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.9"))
142-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("10"))
143-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.10"))
144-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("11"))
145-
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.11"))
160+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.6"))
161+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.7"))
162+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.8"))
163+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("9"))
164+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.9"))
165+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("10"))
166+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.10"))
167+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("11"))
168+
Assert.assertFalse("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.11"))
146169
}
147170

148171
testedStrings = new LinkedList<>()
@@ -151,15 +174,15 @@ class JavaTest {
151174

152175
for (String testedString : testedStrings) {
153176
setJavaVersion(testedString)
154-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.6"))
155-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.7"))
156-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.8"))
157-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("9"))
158-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.9"))
159-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("10"))
160-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.10"))
161-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("11"))
162-
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdk1xOrHigher("1.11"))
177+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.6"))
178+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.7"))
179+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.8"))
180+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("9"))
181+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.9"))
182+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("10"))
183+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.10"))
184+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("11"))
185+
Assert.assertTrue("Java version string compared '" + testedString + "'", Java.isJdkXOrHigher("1.11"))
163186
}
164187
}
165188
}

0 commit comments

Comments
 (0)