Integrate MRI projects for Neon

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / entityownership / EntityOwnershipStatistics.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
index f18ae66e2f430261f117f0cf9cdcc46fe280ea99..442aba0055aaa8900d406d6fba10d285a6fe421b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
@@ -10,17 +10,17 @@ package org.opendaylight.controller.cluster.datastore.entityownership;
 
 import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityTypeFromEntityPath;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.triemap.TrieMap;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
+import tech.pantheon.triemap.TrieMap;
 
 /**
  * EntityOwnershipStatistics is a utility class that keeps track of ownership statistics for the candidates and
@@ -79,12 +79,7 @@ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
             map.put(candidateName, count);
             statistics.put(entityType, map);
         } else {
-            Long candidateOwnedEntities = map.get(candidateName);
-            if (candidateOwnedEntities == null) {
-                map.put(candidateName, count);
-            } else {
-                map.put(candidateName, candidateOwnedEntities + count);
-            }
+            map.merge(candidateName, count, (ownedEntities, addedEntities) -> ownedEntities + addedEntities);
         }
     }
 }