From 693306a9ee9220cefe335eb693345d1a1d914c79 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 23 Oct 2020 18:13:20 +0200 Subject: [PATCH] Remove ShardMBeanFactory This utility class holds only a single method, rehost the method and remove the class. JIRA: CONTROLLER-1965 Change-Id: Id1b861a7e838e90abe1f89e97964a903f0dc15d8 Signed-off-by: Robert Varga --- .../controller/cluster/datastore/Shard.java | 2 +- .../cluster/datastore/ShardMBeanFactory.java | 29 ------------------- .../cluster/datastore/ShardStats.java | 8 +++++ 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardMBeanFactory.java diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 8003e2b4d3..9c548e55f7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -232,7 +232,7 @@ public class Shard extends RaftActor { frontendMetadata); } - shardMBean = ShardMBeanFactory.getShardStatsMBean(name, datastoreContext.getDataStoreMXBeanType(), this); + shardMBean = ShardStats.create(name, datastoreContext.getDataStoreMXBeanType(), this); if (isMetricsCaptureEnabled()) { getContext().become(new MeteringBehavior(this)); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardMBeanFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardMBeanFactory.java deleted file mode 100644 index 565fad3217..0000000000 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardMBeanFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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; - -import org.eclipse.jdt.annotation.NonNull; - -/** - * Factory for creating ShardStats mbeans. - * - * @author Basheeruddin syedbahm@cisco.com - */ -final class ShardMBeanFactory { - - private ShardMBeanFactory() { - } - - static ShardStats getShardStatsMBean(final String shardName, final String mxBeanType, - final @NonNull Shard shard) { - String finalMXBeanType = mxBeanType != null ? mxBeanType : "DistDataStore"; - ShardStats shardStatsMBeanImpl = new ShardStats(shardName, finalMXBeanType, shard); - shardStatsMBeanImpl.registerMBean(); - return shardStatsMBeanImpl; - } -} diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardStats.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardStats.java index d150b3afe5..71cbf128a3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardStats.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardStats.java @@ -15,6 +15,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.checkerframework.checker.lock.qual.GuardedBy; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStatsMXBean; import org.opendaylight.controller.cluster.mgmt.api.FollowerInfo; @@ -68,6 +69,13 @@ final class ShardStats extends AbstractMXBean implements ShardStatsMXBean { stateCache = new OnDemandShardStateCache(shardName, shard != null ? shard.self() : null); } + static ShardStats create(final String shardName, final String mxBeanType, final @NonNull Shard shard) { + String finalMXBeanType = mxBeanType != null ? mxBeanType : "DistDataStore"; + ShardStats shardStatsMBeanImpl = new ShardStats(shardName, finalMXBeanType, shard); + shardStatsMBeanImpl.registerMBean(); + return shardStatsMBeanImpl; + } + @SuppressWarnings("checkstyle:IllegalCatch") private OnDemandRaftState getOnDemandRaftState() { try { -- 2.36.6