summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
dafc95d)
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>
mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
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(), // //
mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-codec-xml</artifactId>
</dependency>
<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>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
import com.google.common.base.Optional;
import com.google.common.base.Strings;
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 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;
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;
*/
class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
*/
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
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();
for (DataTreeCandidate change : changes) {
DataTreeCandidateNode changeRoot = change.getRootNode();
LeafNode<?> ownerLeaf = (LeafNode<?>) changeRoot.getDataAfter().get();
Map<String, Map<String, Long>> all() {
Map<String, Map<String, Long>> snapshot = new HashMap<>();
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;
}
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) {
if (statistics.get(entityType) != null) {
- return statistics.get(entityType).readOnlySnapshot();
+ return statistics.get(entityType).immutableSnapshot();
}
return new HashMap<>();
}
}
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);
+ map = TrieMap.create();
map.put(candidateName, count);
statistics.put(entityType, map);
} else {
map.put(candidateName, count);
statistics.put(entityType, map);
} else {