commit 3ca9cb6dcb56ae556471992a03278b884e2c467b
author Madan Jampani <madan@onlab.us> Tue Jul 21 11:35:44 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 21 18:52:23 2015 +0000
tree 7ba3a580af1e710ab516b7209e2e15e82b649f63
parent d0a97bc8185dff6d6bdf46fabb78ebd06959c234

Minor fixes in DatabaseProxy

Change-Id: I2e1ac92a80f652acc324337383dba526e510f353

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultDatabaseState.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultDatabaseState.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultDatabaseState.java
index 2a37e53..18ae2c4 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultDatabaseState.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultDatabaseState.java
@@ -27,7 +27,6 @@
 import java.util.stream.Collectors;
 import java.util.Set;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.service.DatabaseUpdate;
 import org.onosproject.store.service.Transaction;
@@ -112,7 +111,7 @@
     }
 
     @Override
-    public int size(String mapName) {
+    public int mapSize(String mapName) {
       return getMap(mapName).size();
     }
 
@@ -186,7 +185,7 @@
         return ImmutableSet.copyOf(getMap(mapName)
                 .entrySet()
                 .stream()
-                .map(entry -> Pair.of(entry.getKey(), entry.getValue()))
+                .map(entry -> Maps.immutableEntry(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toSet()));
     }