X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fjmx%2Fmbeans%2Fshard%2FShardStats.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fjmx%2Fmbeans%2Fshard%2FShardStats.java;h=b3234766e6eb1c17c1a1d6e3318c8c05b283b8e1;hp=5a4cc98011d146ca47b34b5dd361353b2b5c4ea3;hb=127042ea7e148d9dc0282acc3780b4754ca69e12;hpb=1e8d188e98614a1f3d781b2f80d61fcd0afde368 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java index 5a4cc98011..b3234766e6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java @@ -5,7 +5,6 @@ * 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.jmx.mbeans.shard; import akka.actor.ActorRef; @@ -15,8 +14,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.datastore.Shard; import org.opendaylight.controller.cluster.raft.base.messages.InitiateCaptureSnapshot; import org.opendaylight.controller.cluster.raft.client.messages.FollowerInfo; @@ -31,6 +30,7 @@ import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { public static final String JMX_CATEGORY_SHARD = "Shards"; + // FIXME: migrate this to Java 8 thread-safe time @GuardedBy("DATE_FORMAT") private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); @@ -64,7 +64,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { private long lastLeadershipChangeTime; - public ShardStats(final String shardName, final String mxBeanType, @Nullable final Shard shard) { + public ShardStats(final String shardName, final String mxBeanType, final @Nullable Shard shard) { super(shardName, mxBeanType, JMX_CATEGORY_SHARD); this.shard = shard; stateCache = new OnDemandShardStateCache(shardName, shard != null ? shard.self() : null);