You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/10/28 18:26:35 UTC
[commons-lang] branch master updated: LANG-1495 Update
EnumUtils.java (#475)
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 4a93461 LANG-1495 Update EnumUtils.java (#475)
4a93461 is described below
commit 4a934610e7d911df707a23ad338ab2e4aa14daa4
Author: vlcheong <ch...@yahoo.com>
AuthorDate: Tue Oct 29 02:26:26 2019 +0800
LANG-1495 Update EnumUtils.java (#475)
* Update EnumUtils.java
* LANG-1495 Add Overloading Methods To EnumUtils
LANG-1495 Add Overloading Methods To EnumUtils
* Add @since 3.10
---
.../java/org/apache/commons/lang3/EnumUtils.java | 42 +++++++++++++++++++---
.../org/apache/commons/lang3/EnumUtilsTest.java | 28 +++++++++++++++
2 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index 0ebca28..88b2c3c 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -119,13 +119,30 @@ public class EnumUtils {
* @return the enum, null if not found
*/
public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final String enumName) {
+ return getEnum(enumClass, enumName, null);
+ }
+
+ /**
+ * <p>Gets the enum for the class, returning {@code defaultEnum} if not found.</p>
+ *
+ * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
+ * for an invalid enum name.</p>
+ *
+ * @param <E> the type of the enumeration
+ * @param enumClass the class of the enum to query, not null
+ * @param enumName the enum name, null returns default enum
+ * @param defaultEnum the default enum
+ * @return the enum, default enum if not found
+ * @since 3.10
+ */
+ public static <E extends Enum<E>> E getEnum(final Class<E> enumClass, final String enumName, final E defaultEnum) {
if (enumName == null) {
- return null;
+ return defaultEnum;
}
try {
return Enum.valueOf(enumClass, enumName);
} catch (final IllegalArgumentException ex) {
- return null;
+ return defaultEnum;
}
}
@@ -142,15 +159,32 @@ public class EnumUtils {
* @since 3.8
*/
public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass, final String enumName) {
+ return getEnumIgnoreCase(enumClass, enumName, null);
+ }
+
+ /**
+ * <p>Gets the enum for the class, returning {@code defaultEnum} if not found.</p>
+ *
+ * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
+ * for an invalid enum name and performs case insensitive matching of the name.</p>
+ *
+ * @param <E> the type of the enumeration
+ * @param enumClass the class of the enum to query, not null
+ * @param enumName the enum name, null returns default enum
+ * @param defaultEnum the default enum
+ * @return the enum, default enum if not found
+ * @since 3.10
+ */
+ public static <E extends Enum<E>> E getEnumIgnoreCase(final Class<E> enumClass, final String enumName, final E defaultEnum) {
if (enumName == null || !enumClass.isEnum()) {
- return null;
+ return defaultEnum;
}
for (final E each : enumClass.getEnumConstants()) {
if (each.name().equalsIgnoreCase(enumName)) {
return each;
}
}
- return null;
+ return defaultEnum;
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
index 8cf13b4..90e8f51 100644
--- a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
@@ -116,6 +116,20 @@ public class EnumUtilsTest {
}
@Test
+ public void test_getEnum_defaultEnum() {
+ assertEquals(Traffic.RED, EnumUtils.getEnum(Traffic.class, "RED", Traffic.AMBER));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnum(Traffic.class, "AMBER", Traffic.GREEN));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnum(Traffic.class, "GREEN", Traffic.RED));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnum(Traffic.class, "PURPLE", Traffic.AMBER));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnum(Traffic.class, "PURPLE", Traffic.GREEN));
+ assertEquals(Traffic.RED, EnumUtils.getEnum(Traffic.class, "PURPLE", Traffic.RED));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnum(Traffic.class, null, Traffic.AMBER));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnum(Traffic.class, null, Traffic.GREEN));
+ assertEquals(Traffic.RED, EnumUtils.getEnum(Traffic.class, null, Traffic.RED));
+ assertNull(EnumUtils.getEnum(Traffic.class, "PURPLE", null));
+ }
+
+ @Test
public void test_getEnumIgnoreCase() {
assertEquals(Traffic.RED, EnumUtils.getEnumIgnoreCase(Traffic.class, "red"));
assertEquals(Traffic.AMBER, EnumUtils.getEnumIgnoreCase(Traffic.class, "Amber"));
@@ -136,6 +150,20 @@ public class EnumUtilsTest {
}
@Test
+ public void test_getEnumIgnoreCase_defaultEnum() {
+ assertEquals(Traffic.RED, EnumUtils.getEnumIgnoreCase(Traffic.class, "red", Traffic.AMBER));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnumIgnoreCase(Traffic.class, "Amber", Traffic.GREEN));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnumIgnoreCase(Traffic.class, "grEEn", Traffic.RED));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnumIgnoreCase(Traffic.class, "PURPLE", Traffic.AMBER));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnumIgnoreCase(Traffic.class, "purple", Traffic.GREEN));
+ assertEquals(Traffic.RED, EnumUtils.getEnumIgnoreCase(Traffic.class, "pUrPlE", Traffic.RED));
+ assertEquals(Traffic.AMBER, EnumUtils.getEnumIgnoreCase(Traffic.class, null, Traffic.AMBER));
+ assertEquals(Traffic.GREEN, EnumUtils.getEnumIgnoreCase(Traffic.class, null, Traffic.GREEN));
+ assertEquals(Traffic.RED, EnumUtils.getEnumIgnoreCase(Traffic.class, null, Traffic.RED));
+ assertNull(EnumUtils.getEnumIgnoreCase(Traffic.class, "PURPLE", null));
+ }
+
+ @Test
public void test_generateBitVector_nullClass() {
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVector(null, EnumSet.of(Traffic.RED)));
}