commit b2243071f2b4e6e496b6dbbc00b87abd81a7ea87
author Jordan Halterman <jordan@onlab.us> Tue May 09 12:04:04 2017 -0700
committer Jordan Halterman <jordan@onlab.us> Wed May 10 19:09:07 2017 +0000
tree 970a0fc278f5b03e456a5b30ec410c0d8b124c14
parent e5ce1455ee4cef6fee7aa94eb1c9835dada86efe

[ONOS-6423] Implement missing getOrDefault methods in primitive wrappers

Change-Id: I560ee03e20511f5ffc93cc4ceb874cb3142c11ab

core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MeteredAsyncConsistentMap.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MeteredAsyncConsistentMap.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MeteredAsyncConsistentMap.java
index ccffead..4b9ff98 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MeteredAsyncConsistentMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MeteredAsyncConsistentMap.java
@@ -54,6 +54,7 @@
     private static final String CONTAINS_KEY = "containsKey";
     private static final String CONTAINS_VALUE = "containsValue";
     private static final String GET = "get";
+    private static final String GET_OR_DEFAULT = "getOrDefault";
     private static final String COMPUTE_IF = "computeIf";
     private static final String PUT = "put";
     private static final String PUT_AND_GET = "putAndGet";
@@ -119,6 +120,13 @@
     }
 
     @Override
+    public CompletableFuture<Versioned<V>> getOrDefault(K key, V defaultValue) {
+        final MeteringAgent.Context timer = monitor.startTimer(GET_OR_DEFAULT);
+        return super.getOrDefault(key, defaultValue)
+                .whenComplete((r, e) -> timer.stop(e));
+    }
+
+    @Override
     public CompletableFuture<Versioned<V>> computeIfAbsent(K key,
                                                            Function<? super K, ? extends V> mappingFunction) {
         final MeteringAgent.Context timer = monitor.startTimer(COMPUTE_IF_ABSENT);