X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardmanager%2FShardManagerInfo.java;h=d7b4932d5dd6f8304aee3701509001ff0ded5ff7;hb=925cb4a228d0fda99c7bfeb432eb25285a223887;hp=9a3faa090b4d5367b7bed71fe855b34b562abd66;hpb=4e3f49788c05730b29468deebc2aaa4ed0d94eef;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
index 9a3faa090b..d7b4932d5d 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
@@ -42,7 +42,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
         this.memberName = Preconditions.checkNotNull(memberName);
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "checkstyle:IllegalCatch"})
     @Override
     public List<String> getLocalShards() {
         try {
@@ -67,6 +67,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
         return memberName.getName();
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void requestSwitchShardState(final ShardIdentifier shardId, final String newState, final long term) {
         // Validates strings argument
         final RaftState state = RaftState.valueOf(newState);
@@ -97,8 +98,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
 
     @Override
     public void switchShardState(String shardId, String newState, long term) {
-        final ShardIdentifier identifier = ShardIdentifier.builder().fromShardIdString(
-                Preconditions.checkNotNull(shardId, "Shard id may not be null")).build();
+        final ShardIdentifier identifier = ShardIdentifier.fromShardIdString(shardId);
         LOG.info("switchShardState called shardName = {}, newState = {}, term = {}", shardId, newState, term);
         requestSwitchShardState(identifier, newState, term);
     }