From b10c0f8706061ef3c4bd5265d783313b1a75b0ba Mon Sep 17 00:00:00 2001 From: work Date: Fri, 18 Jun 2021 11:38:01 +0800 Subject: [PATCH] feat(MapUtils): Add empty string judgment --- .../apache/commons/collections4/MapUtils.java | 2 +- .../commons/collections4/MapUtilsTest.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java index a84b783201..8db19abe2e 100644 --- a/src/main/java/org/apache/commons/collections4/MapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MapUtils.java @@ -1136,7 +1136,7 @@ public static short getShortValue(final Map map, final K key, public static String getString(final Map map, final K key) { if (map != null) { final Object answer = map.get(key); - if (answer != null) { + if (answer != null && answer != "") { return answer.toString(); } } diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java index e6aa766168..cce10758d8 100644 --- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java @@ -50,6 +50,7 @@ import org.apache.commons.collections4.map.LazyMap; import org.apache.commons.collections4.map.MultiValueMap; import org.apache.commons.collections4.map.PredicatedMap; +import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; /** @@ -1314,4 +1315,19 @@ private char getDecimalSeparator() { } return '.'; } + + @Test + public void testBlankCharSequenceMap(){ + final Map blankMap = new HashMap<>(); + blankMap.put("key1",null); + blankMap.put("key2",""); + blankMap.put("key3","LGD"); + String value1 = MapUtils.getString(blankMap, "key1"); + String value2 = MapUtils.getString(blankMap, "key2"); + String value3 = MapUtils.getString(blankMap, "key3"); + assertTrue(StringUtils.isBlank(value1)); + assertTrue(StringUtils.isBlank(value2)); + assertTrue(StringUtils.isNotBlank(value3)); + + } }