This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 05803b0 Add JavaVersion enum constants for Java 16.
05803b0 is described below
commit 05803b0d5826891c03927b2b1a49de8a77799f72
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jun 24 10:53:55 2020 -0400
Add JavaVersion enum constants for Java 16.
Tested with:
openjdk version "16-ea" 2021-03-16
OpenJDK Runtime Environment (build 16-ea+2-35)
OpenJDK 64-Bit Server VM (build 16-ea+2-35, mixed mode, sharing)
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/lang3/JavaVersion.java | 9 +++++++++
src/test/java/org/apache/commons/lang3/JavaVersionTest.java | 4 +++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7152b35..04c5729 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,6 +76,7 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="LANG-1558" type="update" dev="ggregory"
due-to="XenoAmess">Simplify if as some conditions are covered by others
#543.</action>
<action issue="LANG-1528" type="fix" dev="ggregory" due-to="Edwin Delgado
H">StringUtils.replaceEachRepeatedly gives IllegalStateException #505.</action>
<action issue="LANG-1570" type="add" dev="ggregory" due-to="Edgar
Asatryan">Add JavaVersion enum constants for Java 14 and 15. #553.</action>
+ <action type="add" dev="ggregory" due-to="Gary
Gregory">Add JavaVersion enum constants for Java 16.</action>
<action issue="LANG-1556" type="add" dev="ggregory" due-to="XenoAmess">Use
Java 8 lambdas and Map operations.</action>
<action issue="LANG-1565" type="add" dev="ggregory"
due-to="XenoAmess">Change removeLastFieldSeparator to use endsWith
#550.</action>
<action issue="LANG-1557" type="add" dev="ggregory" due-to="XenoAmess,
Gary Gregory">Change a Pattern to a static final field, for not letting it
compile each time the function invoked. #542.</action>
diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java
b/src/main/java/org/apache/commons/lang3/JavaVersion.java
index d275607..b882e8c 100644
--- a/src/main/java/org/apache/commons/lang3/JavaVersion.java
+++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java
@@ -130,6 +130,13 @@ public enum JavaVersion {
JAVA_15(15.0f, "15"),
/**
+ * Java 16
+ *
+ * @since 3.11
+ */
+ JAVA_16(16.0f, "16"),
+
+ /**
* The most recent java version. Mainly introduced to avoid to break when
a new version of Java is used.
*/
JAVA_RECENT(maxVersion(), Float.toString(maxVersion()));
@@ -242,6 +249,8 @@ public enum JavaVersion {
return JAVA_14;
} else if ("15".equals(nom)) {
return JAVA_15;
+ } else if ("16".equals(nom)) {
+ return JAVA_16;
}
final float v = toFloatVersion(nom);
if ((v - 1.) < 1.) { // then we need to check decimals > .9
diff --git a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
index fbfd62d..4db4bfd 100644
--- a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
+++ b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
@@ -25,6 +25,7 @@ import static org.apache.commons.lang3.JavaVersion.JAVA_12;
import static org.apache.commons.lang3.JavaVersion.JAVA_13;
import static org.apache.commons.lang3.JavaVersion.JAVA_14;
import static org.apache.commons.lang3.JavaVersion.JAVA_15;
+import static org.apache.commons.lang3.JavaVersion.JAVA_16;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_1;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_2;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_3;
@@ -66,10 +67,11 @@ public class JavaVersionTest {
assertEquals(JAVA_13, get("13"), "13 failed");
assertEquals(JAVA_14, get("14"), "14 failed");
assertEquals(JAVA_15, get("15"), "15 failed");
+ assertEquals(JAVA_16, get("16"), "16 failed");
assertEquals(JAVA_RECENT, get("1.10"), "1.10 failed");
// assertNull("2.10 unexpectedly worked", get("2.10"));
assertEquals(get("1.5"), getJavaVersion("1.5"), "Wrapper method
failed");
- assertEquals(JAVA_RECENT, get("16"), "Unhandled"); // LANG-1384
+ assertEquals(JAVA_RECENT, get("17"), "Unhandled"); // LANG-1384
}
@Test
