NormalizedNodeAggregator should also report empty

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
index 93846758ec9eb5848e58773d64e395e3f9c90a03..728dd29ea3232c081dc0f5f0930f7185c514f287 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
@@ -8,19 +8,14 @@
 package org.opendaylight.controller.cluster.datastore.persisted;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.cluster.datastore.config.PrefixShardConfiguration;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Represents the persisted snapshot state for the ShardManager.
@@ -47,35 +42,22 @@ public class ShardManagerSnapshot implements Serializable {
         }
 
         @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
+        public void writeExternal(final ObjectOutput out) throws IOException {
             out.writeInt(snapshot.shardList.size());
             for (String shard: snapshot.shardList) {
                 out.writeObject(shard);
             }
-
-            out.writeInt(snapshot.prefixShardConfiguration.size());
-            for (Map.Entry prefixShardConfigEntry : snapshot.prefixShardConfiguration.entrySet()) {
-                out.writeObject(prefixShardConfigEntry.getKey());
-                out.writeObject(prefixShardConfigEntry.getValue());
-            }
         }
 
         @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             int size = in.readInt();
-            List<String> shardList = new ArrayList<>(size);
-            for (int i = 0; i < size; i++) {
-                shardList.add((String) in.readObject());
-            }
-
-            size = in.readInt();
-            Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration = new HashMap<>(size);
+            List<String> localShardList = new ArrayList<>(size);
             for (int i = 0; i < size; i++) {
-                prefixShardConfiguration.put((DOMDataTreeIdentifier) in.readObject(),
-                        (PrefixShardConfiguration) in.readObject());
+                localShardList.add((String) in.readObject());
             }
 
-            snapshot = new ShardManagerSnapshot(shardList, prefixShardConfiguration);
+            snapshot = new ShardManagerSnapshot(localShardList);
         }
 
         private Object readResolve() {
@@ -84,12 +66,9 @@ public class ShardManagerSnapshot implements Serializable {
     }
 
     private final List<String> shardList;
-    private final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration;
 
-    public ShardManagerSnapshot(@Nonnull final List<String> shardList,
-                                final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration) {
+    public ShardManagerSnapshot(final @NonNull List<String> shardList) {
         this.shardList = ImmutableList.copyOf(shardList);
-        this.prefixShardConfiguration = ImmutableMap.copyOf(prefixShardConfiguration);
     }
 
     public List<String> getShardList() {