From: Robert Varga <rovarga@cisco.com>
Date: Tue, 22 Mar 2016 14:34:51 +0000 (+0100)
Subject: Fixup ShardManagerInfo constants
X-Git-Tag: release/boron~298
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c00bac2fb85ceef7a00973bd0be5ba378139e0aa

Fixup ShardManagerInfo constants

Use an ImmutableList for allowed states and make the JMX category a proper constant.

Change-Id: I72fe41b55a0534e72d8aa4a7128c0506339d0a19
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
index 79beae72a3..7a02a46626 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shardmanager/ShardManagerInfo.java
@@ -10,7 +10,8 @@ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager;
 
 import akka.actor.ActorRef;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
+import java.util.Collection;
 import java.util.List;
 import org.opendaylight.controller.cluster.datastore.ShardManager;
 import org.opendaylight.controller.cluster.datastore.messages.SwitchShardBehavior;
@@ -21,11 +22,11 @@ import org.slf4j.LoggerFactory;
 
 public class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoMBean {
 
-    public static String JMX_CATEGORY_SHARD_MANAGER = "ShardManager";
+    public static final String JMX_CATEGORY_SHARD_MANAGER = "ShardManager";
 
     // The only states that you can switch to from outside. You cannot switch to Candidate/IsolatedLeader for example
-    private static final List<String> ACCEPTABLE_STATES
-            = Lists.newArrayList(RaftState.Leader.name(), RaftState.Follower.name());
+    private static final Collection<String> ACCEPTABLE_STATES
+            = ImmutableList.of(RaftState.Leader.name(), RaftState.Follower.name());
 
     private static final Logger LOG = LoggerFactory.getLogger(ShardManagerInfo.class);