X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2Fmbeans%2FRemoteRpcRegistryMXBeanImpl.java;h=d5c72fcea395f0009602ea56c9923e9f053e7d8e;hp=5fbd91cc81c349ad0244ac4b0d96c39f6ab4ebf7;hb=HEAD;hpb=4258ff0d490fc27658ab53dd71bf96c7aa981b13 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java index 5fbd91cc81..d5c72fcea3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java @@ -5,51 +5,33 @@ * 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.remote.rpc.registry.mbeans; import akka.actor.Address; +import akka.util.Timeout; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; import org.opendaylight.controller.remote.rpc.registry.RoutingTable; -import org.opendaylight.controller.remote.rpc.registry.RpcRegistry; import org.opendaylight.controller.remote.rpc.registry.gossip.Bucket; -import org.opendaylight.controller.sal.connector.api.RpcRouter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements RemoteRpcRegistryMXBean { - - protected final Logger log = LoggerFactory.getLogger(getClass()); - - private static final String NULL_CONSTANT = "null"; - - private static final String LOCAL_CONSTANT = "local"; - - private static final String ROUTE_CONSTANT = "route:"; - - private static final String NAME_CONSTANT = " | name:"; - - private final RpcRegistry rpcRegistry; +import org.opendaylight.controller.remote.rpc.registry.gossip.BucketStoreAccess; +import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; - public RemoteRpcRegistryMXBeanImpl(final RpcRegistry rpcRegistry) { - super("RemoteRpcRegistry", "RemoteRpcBroker", null); - this.rpcRegistry = rpcRegistry; - registerMBean(); +public class RemoteRpcRegistryMXBeanImpl extends AbstractRegistryMXBean + implements RemoteRpcRegistryMXBean { + public RemoteRpcRegistryMXBeanImpl(final BucketStoreAccess rpcRegistryAccess, final Timeout timeout) { + super("RemoteRpcRegistry", "RemoteRpcBroker", rpcRegistryAccess, timeout); } @Override public Set getGlobalRpc() { - RoutingTable table = rpcRegistry.getLocalBucket().getData(); - Set globalRpc = new HashSet<>(table.getRoutes().size()); - for (RpcRouter.RouteIdentifier route : table.getRoutes()) { - if (route.getRoute() == null) { - globalRpc.add(route.getType() != null ? route.getType().toString() : NULL_CONSTANT); + RoutingTable table = localData(); + Set globalRpc = new HashSet<>(table.getItems().size()); + for (DOMRpcIdentifier route : table.getItems()) { + if (route.getContextReference().isEmpty()) { + globalRpc.add(route.getType().toString()); } } @@ -59,14 +41,11 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot @Override public Set getLocalRegisteredRoutedRpc() { - RoutingTable table = rpcRegistry.getLocalBucket().getData(); - Set routedRpc = new HashSet<>(table.getRoutes().size()); - for (RpcRouter.RouteIdentifier route : table.getRoutes()) { - if (route.getRoute() != null) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(route.getRoute().toString()).append(NAME_CONSTANT).append(route.getType() != null - ? route.getType().toString() : NULL_CONSTANT); - routedRpc.add(builder.toString()); + RoutingTable table = localData(); + Set routedRpc = new HashSet<>(table.getItems().size()); + for (DOMRpcIdentifier route : table.getItems()) { + if (!route.getContextReference().isEmpty()) { + routedRpc.add(ROUTE_CONSTANT + route.getContextReference() + NAME_CONSTANT + route.getType()); } } @@ -76,12 +55,12 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot @Override public Map findRpcByName(final String name) { - RoutingTable localTable = rpcRegistry.getLocalBucket().getData(); + RoutingTable localTable = localData(); // Get all RPCs from local bucket Map rpcMap = new HashMap<>(getRpcMemberMapByName(localTable, name, LOCAL_CONSTANT)); // Get all RPCs from remote bucket - Map> buckets = rpcRegistry.getRemoteBuckets(); + Map> buckets = remoteBuckets(); for (Entry> entry : buckets.entrySet()) { RoutingTable table = entry.getValue().getData(); rpcMap.putAll(getRpcMemberMapByName(table, name, entry.getKey().toString())); @@ -92,11 +71,11 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot } @Override - public Map findRpcByRoute(String routeId) { - RoutingTable localTable = rpcRegistry.getLocalBucket().getData(); + public Map findRpcByRoute(final String routeId) { + RoutingTable localTable = localData(); Map rpcMap = new HashMap<>(getRpcMemberMapByRoute(localTable, routeId, LOCAL_CONSTANT)); - Map> buckets = rpcRegistry.getRemoteBuckets(); + Map> buckets = remoteBuckets(); for (Entry> entry : buckets.entrySet()) { RoutingTable table = entry.getValue().getData(); rpcMap.putAll(getRpcMemberMapByRoute(table, routeId, entry.getKey().toString())); @@ -109,18 +88,15 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot /** * Search if the routing table route String contains routeName. */ - private Map getRpcMemberMapByRoute(final RoutingTable table, final String routeName, - final String address) { - Set> routes = table.getRoutes(); + private static Map getRpcMemberMapByRoute(final RoutingTable table, final String routeName, + final String address) { + Set routes = table.getItems(); Map rpcMap = new HashMap<>(routes.size()); - for (RpcRouter.RouteIdentifier route : table.getRoutes()) { - if (route.getRoute() != null) { - String routeString = route.getRoute().toString(); + for (DOMRpcIdentifier route : routes) { + if (!route.getContextReference().isEmpty()) { + String routeString = route.getContextReference().toString(); if (routeString.contains(routeName)) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(routeString).append(NAME_CONSTANT).append(route.getType() != null - ? route.getType().toString() : NULL_CONSTANT); - rpcMap.put(builder.toString(), address); + rpcMap.put(ROUTE_CONSTANT + routeString + NAME_CONSTANT + route.getType(), address); } } } @@ -130,18 +106,15 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot /** * Search if the routing table route type contains name. */ - private Map getRpcMemberMapByName(final RoutingTable table, final String name, - final String address) { - Set> routes = table.getRoutes(); + private static Map getRpcMemberMapByName(final RoutingTable table, final String name, + final String address) { + Set routes = table.getItems(); Map rpcMap = new HashMap<>(routes.size()); - for (RpcRouter.RouteIdentifier route : routes) { - if (route.getType() != null) { + for (DOMRpcIdentifier route : routes) { + if (!route.getContextReference().isEmpty()) { String type = route.getType().toString(); if (type.contains(name)) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(route.getRoute() != null ? route.getRoute().toString() : NULL_CONSTANT) - .append(NAME_CONSTANT).append(type); - rpcMap.put(builder.toString(), address); + rpcMap.put(ROUTE_CONSTANT + route.getContextReference() + NAME_CONSTANT + type, address); } } } @@ -150,6 +123,6 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot @Override public String getBucketVersions() { - return rpcRegistry.getVersions().toString(); + return bucketVersions(); } }