commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject [28/50] [abbrv] commons-collections git commit: [COLLECTIONS-589] Add null-safe MapUtils.size(Map< ?, ?>) method.
Date Tue, 11 Jul 2017 17:22:18 GMT
[COLLECTIONS-589] Add null-safe MapUtils.size(Map<?, ?>) method.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1744808 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/930015a1
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/930015a1
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/930015a1

Branch: refs/heads/master
Commit: 930015a137f6bc34127d7646b36d0550842fedfb
Parents: 64c5aec
Author: Gary D. Gregory <ggregory@apache.org>
Authored: Fri May 20 22:30:06 2016 +0000
Committer: Gary D. Gregory <ggregory@apache.org>
Committed: Fri May 20 22:30:06 2016 +0000

----------------------------------------------------------------------
 src/changes/changes.xml                         |  5 ++++-
 .../apache/commons/collections4/MapUtils.java   |  9 ++++++++
 .../commons/collections4/MapUtilsTest.java      | 23 +++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-collections/blob/930015a1/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a5f8cc1..88b3751 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,7 +20,10 @@
     <title>Commons Collections Changes</title>
   </properties>
   <body>
-  <release version="4.2" date="YYYY-MM-DD" description="">
+  <release version="4.2" date="YYYY-MM-DD" description="New features">
+  <action issue="COLLECTIONS-589" dev="ggregory" type="add" due-to="Gary Gregory">
+      Add null-safe MapUtils.size(Map&lt;?, ?>) method. 
+  </action>
   </release>
   <release version="4.1" date="2015-11-28" description="This is a security and minor release.">
     <action issue="COLLECTIONS-508" dev="tn" type="add">

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/930015a1/src/main/java/org/apache/commons/collections4/MapUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java
index 39f3338..2b0c65c 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -1794,4 +1794,13 @@ public class MapUtils {
                                                         new AbstractSortedMapDecorator<K,
V>(sortedMap) {};
     }
 
+    /**
+     * Gets the given map size or 0 if the map is null
+     * @param map a Map or null
+     * @return the given map size or 0 if the map is null
+     */
+    public static int size(Map<?, ?> map) {
+        return map == null ? 0 : map.size();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/930015a1/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index f955a4d..f2ef8f8 100644
--- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -16,7 +16,11 @@
  */
 package org.apache.commons.collections4;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -890,4 +894,21 @@ public class MapUtilsTest {
         assertSame(iMap, MapUtils.iterableMap(iMap));
     }
 
+    @Test 
+    public void testSize0() {
+        assertEquals(0, MapUtils.size(new HashMap<Object, Object>()));
+    }
+
+    @Test 
+    public void testSizeNull() {
+        assertEquals(0, MapUtils.size(null));
+    }
+
+    @Test 
+    public void testSize() {
+        final HashMap<Object, Object> map = new HashMap<Object, Object>();
+        map.put("A", "1");
+        map.put("B", "2");
+        assertEquals(2, MapUtils.size(map));
+    }
 }


Mime
View raw message