BUG-8639: always invalidate primary info cache

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerSnapshot.java
index b6fe842692beba2c8e9319dc43cc30c1cd441946..9899aeb1fc12dcadabb4b13cefc419a5e3bad1af 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerSnapshot.java
@@ -10,26 +10,31 @@ package org.opendaylight.controller.cluster.datastore.shardmanager;
 
 import com.google.common.collect.ImmutableList;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
 
 /**
- * Persisted data of the ShardManager
+ * Persisted data of the ShardManager.
+ *
+ * @deprecated Use {@link org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot} instead.
  */
-// FIXME: make this package-protected once forShardList is removed.
+@Deprecated
 public final class ShardManagerSnapshot implements Serializable {
     private static final long serialVersionUID = 1L;
     private final List<String> shardList;
 
-    ShardManagerSnapshot(final @Nonnull List<String> shardList) {
+    ShardManagerSnapshot(@Nonnull final List<String> shardList) {
         this.shardList = ImmutableList.copyOf(shardList);
     }
 
-    List<String> getShardList() {
+    public List<String> getShardList() {
         return this.shardList;
     }
 
     /**
+     * Creates a ShardManagerSnapshot.
+     *
      * @deprecated This method is for migration only and should me removed once
      *             org.opendaylight.controller.cluster.datastore.ShardManagerSnapshot is removed.
      */
@@ -38,6 +43,11 @@ public final class ShardManagerSnapshot implements Serializable {
         return new ShardManagerSnapshot(shardList);
     }
 
+    private Object readResolve() {
+        return new org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot(shardList,
+                Collections.emptyMap());
+    }
+
     @Override
     public String toString() {
         return "ShardManagerSnapshot [ShardList = " + shardList + " ]";