commit c2e6815ddcb82fbba6b6ffc378e781cd87bc4009
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Aug 16 13:47:36 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Aug 16 22:45:15 2016 +0000
tree f9015b045d07db327e6e43d145a943583d3963dd
parent a43d0334aa0237fd8d5ff8324fa62632bbf59ac0

Use Java 8 Map#compute when possible

Change-Id: Ida300c054449047096f355f09b3843e4934dcd18

core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 554ef2a..33fa8cd 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -28,7 +28,6 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.util.KryoNamespace;
-import org.onlab.util.NewConcurrentHashMap;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.cluster.NodeId;
@@ -89,7 +88,6 @@
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
 import static org.onlab.util.Tools.get;
 import static org.onlab.util.Tools.groupedThreads;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -239,16 +237,6 @@
         }
     }
 
-    private static NewConcurrentHashMap<GroupId, Group>
-    lazyEmptyExtraneousGroupIdTable() {
-        return NewConcurrentHashMap.ifNeeded();
-    }
-
-    private static NewConcurrentHashMap<GroupId, StoredGroupEntry>
-    lazyEmptyGroupIdTable() {
-        return NewConcurrentHashMap.ifNeeded();
-    }
-
     /**
      * Returns the group store eventual consistent key map.
      *
@@ -266,8 +254,7 @@
      * @return Map representing group key table of given device.
      */
     private ConcurrentMap<GroupId, StoredGroupEntry> getGroupIdTable(DeviceId deviceId) {
-        return createIfAbsentUnchecked(groupEntriesById,
-                                       deviceId, lazyEmptyGroupIdTable());
+        return groupEntriesById.computeIfAbsent(deviceId, k -> new ConcurrentHashMap<>());
     }
 
     /**
@@ -288,9 +275,7 @@
      */
     private ConcurrentMap<GroupId, Group>
     getExtraneousGroupIdTable(DeviceId deviceId) {
-        return createIfAbsentUnchecked(extraneousGroupEntriesById,
-                                       deviceId,
-                                       lazyEmptyExtraneousGroupIdTable());
+        return extraneousGroupEntriesById.computeIfAbsent(deviceId, k -> new ConcurrentHashMap<>());
     }
 
     /**