Bump upstream versions

[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 9899aeb1fc12dcadabb4b13cefc419a5e3bad1af..b99077980555b8730e5c2d1ec832160445890797 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
@@ -5,47 +5,31 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 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;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Persisted data of the ShardManager.
  *
  * @deprecated Use {@link org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot} instead.
  */
-@Deprecated
-public final class ShardManagerSnapshot implements Serializable {
+// FIXME: 5.0.0: remove this class
+@Deprecated(forRemoval = true)
+final class ShardManagerSnapshot implements Serializable {
     private static final long serialVersionUID = 1L;
+
     private final List<String> shardList;
 
-    ShardManagerSnapshot(@Nonnull final List<String> shardList) {
+    ShardManagerSnapshot(final @NonNull List<String> shardList) {
         this.shardList = ImmutableList.copyOf(shardList);
     }
 
-    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.
-     */
-    @Deprecated
-    public static ShardManagerSnapshot forShardList(final @Nonnull List<String> shardList) {
-        return new ShardManagerSnapshot(shardList);
-    }
-
     private Object readResolve() {
-        return new org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot(shardList,
-                Collections.emptyMap());
+        return new org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot(shardList);
     }
 
     @Override