Bump odlparent to 6.0.0

[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 9dc95c058a1bbcf92d2adbd76f2daefcc1faeaa6..0bacbd0dbc03a9873215eeb5e85708bc6bdb6497 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
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.cluster.datastore.config.PrefixShardConfiguration;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 
@@ -63,19 +63,19 @@ public class ShardManagerSnapshot implements Serializable {
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             int size = in.readInt();
-            List<String> shardList = new ArrayList<>(size);
+            List<String> localShardList = new ArrayList<>(size);
             for (int i = 0; i < size; i++) {
-                shardList.add((String) in.readObject());
+                localShardList.add((String) in.readObject());
             }
 
             size = in.readInt();
-            Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration = new HashMap<>(size);
+            Map<DOMDataTreeIdentifier, PrefixShardConfiguration> localPrefixShardConfiguration = new HashMap<>(size);
             for (int i = 0; i < size; i++) {
-                prefixShardConfiguration.put((DOMDataTreeIdentifier) in.readObject(),
+                localPrefixShardConfiguration.put((DOMDataTreeIdentifier) in.readObject(),
                         (PrefixShardConfiguration) in.readObject());
             }
 
-            snapshot = new ShardManagerSnapshot(shardList, prefixShardConfiguration);
+            snapshot = new ShardManagerSnapshot(localShardList, localPrefixShardConfiguration);
         }
 
         private Object readResolve() {
@@ -86,7 +86,7 @@ public class ShardManagerSnapshot implements Serializable {
     private final List<String> shardList;
     private final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration;
 
-    public ShardManagerSnapshot(@Nonnull final List<String> shardList,
+    public ShardManagerSnapshot(final @NonNull List<String> shardList,
                                 final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixShardConfiguration) {
         this.shardList = ImmutableList.copyOf(shardList);
         this.prefixShardConfiguration = ImmutableMap.copyOf(prefixShardConfiguration);