From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 19 Jul 2017 12:08:04 +0000 (+0200)
Subject: BUG-7464: use yangtools.triemap
X-Git-Tag: release/nitrogen~34
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=354ad30e58618b4bdec256d7a78bd80284cccc77

BUG-7464: use yangtools.triemap

Yangtools is moving away from using upstreap Triemap to its
internal fork of that codebase. Switch this code, too.

Change-Id: I0d60ccc8927505a83a35631333203817484da9e0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 2a13f6d09c..5d95761128 100644
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -37,6 +37,7 @@ public class TestHelper {
                 mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
+                mavenBundle(YANGTOOLS, "triemap").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
 
diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 5ebe0a7f32..964d35dfb4 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -212,6 +212,10 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>triemap</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
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 6c013c1c8f..f18ae66e2f 100644
--- 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
@@ -12,11 +12,11 @@ import static org.opendaylight.controller.cluster.datastore.entityownership.Enti
 
 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 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;
@@ -31,13 +31,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNod
  */
 class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
 
-    private final 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();
@@ -59,23 +59,23 @@ 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) {
+    Map<String, Long> byEntityType(final String entityType) {
         if (statistics.get(entityType) != null) {
-            return statistics.get(entityType).readOnlySnapshot();
+            return statistics.get(entityType).immutableSnapshot();
         }
         return new HashMap<>();
     }
 
-    private void updateStatistics(String entityType, String candidateName, long count) {
-        Map<String, Long> map = statistics.get(entityType);
+    private void updateStatistics(final String entityType, final String candidateName, final long count) {
+        TrieMap<String, Long> map = statistics.get(entityType);
         if (map == null) {
-            map = new TrieMap<>();
+            map = TrieMap.create();
             map.put(candidateName, count);
             statistics.put(entityType, map);
         } else {