X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futils%2FRootScatterGather.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futils%2FRootScatterGather.java;h=c0d4de44d34dadf90f4f72132d59c1a4db899d9f;hb=f40e99a51cd3fc2c9be3ac8aa0772bdb6b6ce479;hp=4848a498b4b9bab13d856d009258cd96de5d37a3;hpb=609f0bd2646991335ab40a9a2265dcc928c0e6f7;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/RootScatterGather.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/RootScatterGather.java
index 4848a498b4..c0d4de44d3 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/RootScatterGather.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/RootScatterGather.java
@@ -103,7 +103,7 @@ public final class RootScatterGather {
         return FluentFuture.from(Futures.transform(
             Futures.allAsList(readFutures.collect(ImmutableList.toImmutableList())), input -> {
                 try {
-                    return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.empty(), input,
+                    return NormalizedNodeAggregator.aggregate(YangInstanceIdentifier.of(), input,
                         actorUtils.getSchemaContext(), actorUtils.getDatastoreContext().getLogicalStoreType());
                 } catch (DataValidationFailedException e) {
                     throw new IllegalArgumentException("Failed to aggregate", e);
@@ -116,10 +116,10 @@ public final class RootScatterGather {
         final var builders = allShards
             .collect(Collectors.toUnmodifiableMap(Function.identity(), unused -> Builders.containerBuilder()));
         for (var child : rootNode.body()) {
-            final var shard = childToShard.apply(child.getIdentifier());
+            final var shard = childToShard.apply(child.name());
             verifyNotNull(builders.get(shard), "Failed to find builder for %s", shard).addChild(child);
         }
-        return streamContainers(rootNode.getIdentifier(), builders);
+        return streamContainers(rootNode.name(), builders);
     }
 
     /**
@@ -134,10 +134,10 @@ public final class RootScatterGather {
             final Function<PathArgument, T> childToShard) {
         final var builders = new HashMap<T, DataContainerNodeBuilder<NodeIdentifier, ContainerNode>>();
         for (var child : rootNode.body()) {
-            builders.computeIfAbsent(childToShard.apply(child.getIdentifier()), unused -> Builders.containerBuilder())
+            builders.computeIfAbsent(childToShard.apply(child.name()), unused -> Builders.containerBuilder())
                 .addChild(child);
         }
-        return streamContainers(rootNode.getIdentifier(), builders);
+        return streamContainers(rootNode.name(), builders);
     }
 
     private static <T> @NonNull Stream<ShardContainer<T>> streamContainers(final NodeIdentifier rootId,