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/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java

diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
index 14e37b8..4218d47 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
@@ -46,7 +46,6 @@
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.store.AbstractStore;
 import org.onlab.packet.ChassisId;
-import org.onlab.util.NewConcurrentHashMap;
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
@@ -73,7 +72,6 @@
 import static com.google.common.base.Verify.verify;
 import static org.onosproject.net.device.DeviceEvent.Type.*;
 import static org.slf4j.LoggerFactory.getLogger;
-import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
 import static org.onosproject.net.DefaultAnnotations.union;
 import static org.onosproject.net.DefaultAnnotations.merge;
 
@@ -347,8 +345,7 @@
     // Gets the map of ports for the specified device; if one does not already
     // exist, it creates and registers a new one.
     private ConcurrentMap<PortNumber, Port> getPortMap(DeviceId deviceId) {
-        return createIfAbsentUnchecked(devicePorts, deviceId,
-                                       NewConcurrentHashMap.ifNeeded());
+        return devicePorts.computeIfAbsent(deviceId, k -> new ConcurrentHashMap<>());
     }
 
     private Map<ProviderId, DeviceDescriptions> getOrCreateDeviceDescriptions(