Adjust to yangtools-2.0.0 changes

[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 3ea4362ac9b2a08190ea368a7e6b4e24c55cafbd..a96bbe355669ee9c060067b3cb97ec8e07eda0c9 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
@@ -9,13 +9,14 @@
 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 com.romix.scala.collection.concurrent.TrieMap;
 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;
@@ -24,32 +25,32 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNod
 /**
  * EntityOwnershipStatistics is a utility class that keeps track of ownership statistics for the candidates and
  * caches it for quick count queries.
- * <p>
+ * <p/>
  * While the entity ownership model does maintain the information about which entity is owned by which candidate
  * finding out how many entities of a given type are owned by a given candidate is not an efficient query.
  */
 class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
 
-    private TrieMap<String, TrieMap<String, Long>> statistics = new TrieMap<>();
+    private final TrieMap<String, TrieMap<String, Long>> statistics = TrieMap.create();
 
     EntityOwnershipStatistics(){
     }
 
     @Override
-    public void onDataTreeChanged(@Nonnull Collection<DataTreeCandidate> changes) {
+    public void onDataTreeChanged(@Nonnull final Collection<DataTreeCandidate> changes) {
         for (DataTreeCandidate change : changes) {
             DataTreeCandidateNode changeRoot = change.getRootNode();
             LeafNode<?> ownerLeaf = (LeafNode<?>) changeRoot.getDataAfter().get();
             String entityType = entityTypeFromEntityPath(change.getRootPath());
             String newOwner = extractOwner(ownerLeaf);
-            if(!Strings.isNullOrEmpty(newOwner)) {
+            if (!Strings.isNullOrEmpty(newOwner)) {
                 updateStatistics(entityType, newOwner, 1);
             }
 
             Optional<NormalizedNode<?, ?>> dataBefore = changeRoot.getDataBefore();
             if (dataBefore.isPresent()) {
                 String origOwner = extractOwner((LeafNode<?>) changeRoot.getDataBefore().get());
-                if(!Strings.isNullOrEmpty(origOwner)) {
+                if (!Strings.isNullOrEmpty(origOwner)) {
                     updateStatistics(entityType, origOwner, -1);
                 }
             }
@@ -58,29 +59,32 @@ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
 
     Map<String, Map<String, Long>> all() {
         Map<String, Map<String, Long>> snapshot = new HashMap<>();
-        for (String entityType : statistics.readOnlySnapshot().keySet()) {
+        for (String entityType : statistics.immutableSnapshot().keySet()) {
             snapshot.put(entityType, byEntityType(entityType));
         }
         return snapshot;
     }
 
-    Map<String, Long> byEntityType(String entityType){
-        return statistics.get(entityType).readOnlySnapshot();
+    Map<String, Long> byEntityType(final String entityType) {
+        if (statistics.get(entityType) != null) {
+            return statistics.get(entityType).immutableSnapshot();
+        }
+        return new HashMap<>();
     }
 
-    private void updateStatistics(String entityType, String candidateName, long count){
-        Map<String, Long> m = statistics.get(entityType);
-        if(m == null){
-            m = new TrieMap<>();
-            m.put(candidateName, count);
-            statistics.put(entityType, m);
+    private void updateStatistics(final String entityType, final String candidateName, final long count) {
+        TrieMap<String, Long> map = statistics.get(entityType);
+        if (map == null) {
+            map = TrieMap.create();
+            map.put(candidateName, count);
+            statistics.put(entityType, map);
         } else {
-            Long candidateOwnedEntities = m.get(candidateName);
-            if(candidateOwnedEntities == null){
-                m.put(candidateName, count);
+            Long candidateOwnedEntities = map.get(candidateName);
+            if (candidateOwnedEntities == null) {
+                map.put(candidateName, count);
             } else {
-                m.put(candidateName, candidateOwnedEntities + count);
+                map.put(candidateName, candidateOwnedEntities + count);
             }
         }
     }
-}
\ No newline at end of file
+}