From 9ddc65e1ddae50f691566cd9382707679436c055 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Thu, 27 Oct 2016 11:42:39 -0400 Subject: [PATCH] Fix CS warnings in sal-remoterpc-connector and enable enforcement Fixed checkstyle warnings and enabled enforcement. Most of the warnings/changes were for: - white space before if/for/while/catch - white space before beginning brace - line too long - illegal catching of Exception (suppressed) - variable name too short - indentation - local vars/params hiding a field - remove unused vars - convert functional interfaces to lambdas (eclipse save action) - missing period after first sentence in javadoc - adding final for locals declared too far from first usage Change-Id: I222d003cb07810434cb7f62420b4a9157f1d3027 Signed-off-by: Tom Pantelis --- .../md-sal/sal-remoterpc-connector/pom.xml | 7 + .../remote/rpc/RemoteDOMRpcException.java | 2 +- .../remote/rpc/RemoteDOMRpcFuture.java | 15 +- .../remote/rpc/RemoteRpcImplementation.java | 7 +- .../controller/remote/rpc/RemoteRpcInput.java | 3 +- .../remote/rpc/RemoteRpcProvider.java | 124 +++++++------- .../remote/rpc/RemoteRpcProviderConfig.java | 35 ++-- .../remote/rpc/RouteIdentifierImpl.java | 155 +++++++++--------- .../controller/remote/rpc/RpcBroker.java | 20 +-- .../remote/rpc/RpcErrorsException.java | 10 +- .../controller/remote/rpc/RpcListener.java | 24 +-- .../controller/remote/rpc/RpcManager.java | 75 ++++----- .../remote/rpc/TerminationMonitor.java | 16 +- .../remote/rpc/messages/ExecuteRpc.java | 4 - .../rpc/messages/UpdateSchemaContext.java | 15 +- .../remote/rpc/registry/RoutingTable.java | 16 +- .../remote/rpc/registry/RpcRegistry.java | 64 +++----- .../remote/rpc/registry/gossip/Bucket.java | 2 +- .../rpc/registry/gossip/BucketImpl.java | 7 +- .../rpc/registry/gossip/BucketStore.java | 55 +++---- .../remote/rpc/registry/gossip/Gossiper.java | 107 ++++++------ .../remote/rpc/registry/gossip/Messages.java | 37 +++-- .../mbeans/RemoteRpcRegistryMXBean.java | 3 +- .../mbeans/RemoteRpcRegistryMXBeanImpl.java | 81 ++++----- .../rpc/utils/LatestEntryRoutingLogic.java | 57 +++---- .../remote/rpc/utils/RoutingLogic.java | 4 +- .../controller/utils/ConditionalProbe.java | 4 +- .../remote/rpc/AbstractRpcTest.java | 16 +- .../rpc/RemoteRpcImplementationTest.java | 38 ++--- .../rpc/RemoteRpcProviderConfigTest.java | 15 +- .../remote/rpc/RemoteRpcProviderTest.java | 27 ++- .../controller/remote/rpc/RpcBrokerTest.java | 9 +- .../remote/rpc/registry/RpcRegistryTest.java | 77 ++++----- .../rpc/registry/gossip/BucketStoreTest.java | 36 ++-- .../rpc/registry/gossip/GossiperTest.java | 31 ++-- .../utils/LatestEntryRoutingLogicTest.java | 63 ++++--- 36 files changed, 585 insertions(+), 676 deletions(-) diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index 77c18eb183..21e1634448 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -197,6 +197,13 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcException.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcException.java index b0e9d4e786..d7e18e6543 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcException.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcException.java @@ -13,7 +13,7 @@ class RemoteDOMRpcException extends DOMRpcException { private static final long serialVersionUID = 1L; - public RemoteDOMRpcException(final String message,final Throwable cause) { + RemoteDOMRpcException(final String message, final Throwable cause) { super(message,cause); } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java index 5df6e2bb07..46c7676b53 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.remote.rpc; import akka.dispatch.OnComplete; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.CheckedFuture; import java.util.concurrent.ExecutionException; @@ -26,10 +25,6 @@ import org.slf4j.LoggerFactory; import scala.concurrent.ExecutionContext; import scala.concurrent.Future; -/** - * @author tony - * - */ class RemoteDOMRpcFuture extends AbstractFuture implements CheckedFuture { private static final Logger LOG = LoggerFactory.getLogger(RemoteDOMRpcFuture.class); @@ -60,7 +55,7 @@ class RemoteDOMRpcFuture extends AbstractFuture implements Checked } catch (final ExecutionException e) { throw mapException(e); } catch (final InterruptedException e) { - throw Throwables.propagate(e); + throw new RemoteDOMRpcException("Interruped while invoking RPC", e); } } @@ -71,16 +66,16 @@ class RemoteDOMRpcFuture extends AbstractFuture implements Checked } catch (final ExecutionException e) { throw mapException(e); } catch (final InterruptedException e) { - throw Throwables.propagate(e); + throw new RemoteDOMRpcException("Interruped while invoking RPC", e); } } - private DOMRpcException mapException(final ExecutionException e) { - final Throwable cause = e.getCause(); + private DOMRpcException mapException(final ExecutionException ex) { + final Throwable cause = ex.getCause(); if (cause instanceof DOMRpcException) { return (DOMRpcException) cause; } - return new RemoteDOMRpcException("Exception during invoking RPC", e); + return new RemoteDOMRpcException("Exception during invoking RPC", ex); } private final class FutureUpdater extends OnComplete { diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java index f80aae4fe2..e02c202551 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementation.java @@ -48,8 +48,8 @@ public class RemoteRpcImplementation implements DOMRpcImplementation { final NormalizedNode input) { if (input instanceof RemoteRpcInput) { LOG.warn("Rpc {} was removed during execution or there is loop present. Failing received rpc.", rpc); - return Futures - .immediateFailedCheckedFuture(new DOMRpcImplementationNotAvailableException( + return Futures.immediateFailedCheckedFuture( + new DOMRpcImplementationNotAvailableException( "Rpc implementation for {} was removed during processing.", rpc)); } final RemoteDOMRpcFuture frontEndFuture = RemoteDOMRpcFuture.create(rpc.getType().getLastComponent()); @@ -67,7 +67,8 @@ public class RemoteRpcImplementation implements DOMRpcImplementation { } else { final ActorRef remoteImplRef = new LatestEntryRoutingLogic(routePairs).select(); final Object executeRpcMessage = ExecuteRpc.from(rpc, input); - LOG.debug("Found remote actor {} for rpc {} - sending {}", remoteImplRef, rpc.getType(), executeRpcMessage); + LOG.debug("Found remote actor {} for rpc {} - sending {}", remoteImplRef, rpc.getType(), + executeRpcMessage); frontEndFuture.completeWith(ask(remoteImplRef, executeRpcMessage, config.getAskDuration())); } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcInput.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcInput.java index a7f43f4e27..59528fd62c 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcInput.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcInput.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; - class RemoteRpcInput implements ContainerNode { private final ContainerNode delegate; @@ -28,7 +27,7 @@ class RemoteRpcInput implements ContainerNode { } protected static RemoteRpcInput from(@Nullable final NormalizedNode node) { - if(node == null) { + if (node == null) { return null; } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java index 80aebd1918..52f803d542 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java @@ -31,68 +31,66 @@ import org.slf4j.LoggerFactory; */ public class RemoteRpcProvider implements AutoCloseable, Provider, SchemaContextListener { - private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProvider.class); - - private final DOMRpcProviderService rpcProvisionRegistry; - - private ListenerRegistration schemaListenerRegistration; - private final ActorSystem actorSystem; - private SchemaService schemaService; - private DOMRpcService rpcService; - private SchemaContext schemaContext; - private ActorRef rpcManager; - private final RemoteRpcProviderConfig config; - - - public RemoteRpcProvider(final ActorSystem actorSystem, - final DOMRpcProviderService rpcProvisionRegistry, - final RemoteRpcProviderConfig config) { - this.actorSystem = actorSystem; - this.rpcProvisionRegistry = rpcProvisionRegistry; - this.config = Preconditions.checkNotNull(config); - } - - public void setRpcService(DOMRpcService rpcService) { - this.rpcService = rpcService; - } - - public void setSchemaService(SchemaService schemaService) { - this.schemaService = schemaService; - } - - @Override - public void close() throws Exception { - if (schemaListenerRegistration != null) { - schemaListenerRegistration.close(); - schemaListenerRegistration = null; + private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProvider.class); + + private final DOMRpcProviderService rpcProvisionRegistry; + + private ListenerRegistration schemaListenerRegistration; + private final ActorSystem actorSystem; + private SchemaService schemaService; + private DOMRpcService rpcService; + private SchemaContext schemaContext; + private ActorRef rpcManager; + private final RemoteRpcProviderConfig config; + + public RemoteRpcProvider(final ActorSystem actorSystem, final DOMRpcProviderService rpcProvisionRegistry, + final RemoteRpcProviderConfig config) { + this.actorSystem = actorSystem; + this.rpcProvisionRegistry = rpcProvisionRegistry; + this.config = Preconditions.checkNotNull(config); + } + + public void setRpcService(DOMRpcService rpcService) { + this.rpcService = rpcService; + } + + public void setSchemaService(SchemaService schemaService) { + this.schemaService = schemaService; + } + + @Override + public void close() throws Exception { + if (schemaListenerRegistration != null) { + schemaListenerRegistration.close(); + schemaListenerRegistration = null; + } + } + + @Override + public void onSessionInitiated(final Broker.ProviderSession session) { + schemaService = session.getService(SchemaService.class); + rpcService = session.getService(DOMRpcService.class); + start(); + } + + @Override + public Collection getProviderFunctionality() { + return null; + } + + public void start() { + LOG.info("Starting remote rpc service..."); + + schemaContext = schemaService.getGlobalContext(); + rpcManager = actorSystem.actorOf(RpcManager.props(schemaContext, rpcProvisionRegistry, rpcService, config), + config.getRpcManagerName()); + schemaListenerRegistration = schemaService.registerSchemaContextListener(this); + LOG.debug("rpc manager started"); + } + + @Override + public void onGlobalContextUpdated(final SchemaContext newSchemaContext) { + this.schemaContext = newSchemaContext; + rpcManager.tell(new UpdateSchemaContext(newSchemaContext), null); } - } - - @Override - public void onSessionInitiated(final Broker.ProviderSession session) { - schemaService = session.getService(SchemaService.class); - rpcService = session.getService(DOMRpcService.class); - start(); - } - - @Override - public Collection getProviderFunctionality() { - return null; - } - - public void start() { - LOG.info("Starting remote rpc service..."); - - schemaContext = schemaService.getGlobalContext(); - rpcManager = actorSystem.actorOf(RpcManager.props(schemaContext, - rpcProvisionRegistry, rpcService, config), config.getRpcManagerName()); - schemaListenerRegistration = schemaService.registerSchemaContextListener(this); - LOG.debug("rpc manager started"); - } - - @Override - public void onGlobalContextUpdated(final SchemaContext schemaContext) { - this.schemaContext = schemaContext; - rpcManager.tell(new UpdateSchemaContext(schemaContext), null); - } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java index cb5097d24e..8cdf9c5ef1 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java @@ -13,8 +13,6 @@ import java.util.concurrent.TimeUnit; import org.opendaylight.controller.cluster.common.actor.CommonConfig; import scala.concurrent.duration.FiniteDuration; -/** - */ public class RemoteRpcProviderConfig extends CommonConfig { protected static final String TAG_RPC_BROKER_NAME = "rpc-broker-name"; @@ -30,38 +28,37 @@ public class RemoteRpcProviderConfig extends CommonConfig { private Timeout cachedAskDuration; private FiniteDuration cachedGossipTickInterval; - public RemoteRpcProviderConfig(Config config){ + public RemoteRpcProviderConfig(Config config) { super(config); } - public String getRpcBrokerName(){ + public String getRpcBrokerName() { return get().getString(TAG_RPC_BROKER_NAME); } - public String getRpcRegistryName(){ + public String getRpcRegistryName() { return get().getString(TAG_RPC_REGISTRY_NAME); } - public String getRpcManagerName(){ + public String getRpcManagerName() { return get().getString(TAG_RPC_MGR_NAME); } - public String getRpcBrokerPath(){ + public String getRpcBrokerPath() { return get().getString(TAG_RPC_BROKER_PATH); } - public String getRpcRegistryPath(){ + public String getRpcRegistryPath() { return get().getString(TAG_RPC_REGISTRY_PATH); } - public String getRpcManagerPath(){ + public String getRpcManagerPath() { return get().getString(TAG_RPC_MGR_PATH); } - - public Timeout getAskDuration(){ - if (cachedAskDuration != null){ + public Timeout getAskDuration() { + if (cachedAskDuration != null) { return cachedAskDuration; } @@ -71,7 +68,7 @@ public class RemoteRpcProviderConfig extends CommonConfig { return cachedAskDuration; } - public FiniteDuration getGossipTickInterval(){ + public FiniteDuration getGossipTickInterval() { if (cachedGossipTickInterval != null) { return cachedGossipTickInterval; } @@ -87,13 +84,13 @@ public class RemoteRpcProviderConfig extends CommonConfig { */ public static RemoteRpcProviderConfig newInstance(String actorSystemName, boolean metricCaptureEnabled, int mailboxCapacity) { - return new Builder(actorSystemName).metricCaptureEnabled(metricCaptureEnabled). - mailboxCapacity(mailboxCapacity).build(); + return new Builder(actorSystemName).metricCaptureEnabled(metricCaptureEnabled) + .mailboxCapacity(mailboxCapacity).build(); } - public static class Builder extends CommonConfig.Builder{ + public static class Builder extends CommonConfig.Builder { - public Builder(String actorSystemName){ + public Builder(String actorSystemName) { super(actorSystemName); //Actor names @@ -118,10 +115,8 @@ public class RemoteRpcProviderConfig extends CommonConfig { } @Override - public RemoteRpcProviderConfig build(){ + public RemoteRpcProviderConfig build() { return new RemoteRpcProviderConfig(merge()); } } - - } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java index 99e812193c..344649adb0 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java @@ -13,77 +13,86 @@ import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier,Serializable { - private static final long serialVersionUID = 1L; - - private final QName context; - private final QName type; - private final YangInstanceIdentifier route; - - public RouteIdentifierImpl(final QName context, final QName type, final YangInstanceIdentifier route) { - Preconditions.checkNotNull(type, "Rpc type should not be null"); - this.context = context; - this.type = type; - this.route = route; - } - - @Override - public QName getContext() { - return context; - } - - @Override - public QName getType() { - return type; - } - - @Override - public YangInstanceIdentifier getRoute() { - return route; - } - - - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - final RouteIdentifierImpl that = (RouteIdentifierImpl) o; - - if (context == null){ - if (that.getContext() != null) return false; - }else - if (!context.equals(that.context)) return false; - - if (route == null){ - if (that.getRoute() != null) return false; - }else - if (!route.equals(that.route)) return false; - - if (type == null){ - if (that.getType() != null) return false; - }else - if (!type.equals(that.type)) return false; - - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 0; - result = prime * result + (context == null ? 0:context.hashCode()); - result = prime * result + (type == null ? 0:type.hashCode()); - result = prime * result + (route == null ? 0:route.hashCode()); - return result; - } - - @Override - public String toString() { - return "RouteIdentifierImpl{" + - "context=" + context + - ", type=" + type + - ", route=" + route + - '}'; - } +public class RouteIdentifierImpl + implements RpcRouter.RouteIdentifier, Serializable { + private static final long serialVersionUID = 1L; + + private final QName context; + private final QName type; + private final YangInstanceIdentifier route; + + public RouteIdentifierImpl(final QName context, final QName type, final YangInstanceIdentifier route) { + Preconditions.checkNotNull(type, "Rpc type should not be null"); + this.context = context; + this.type = type; + this.route = route; + } + + @Override + public QName getContext() { + return context; + } + + @Override + public QName getType() { + return type; + } + + @Override + public YangInstanceIdentifier getRoute() { + return route; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null || getClass() != obj.getClass()) { + return false; + } + + final RouteIdentifierImpl that = (RouteIdentifierImpl) obj; + + if (context == null) { + if (that.getContext() != null) { + return false; + } + } else if (!context.equals(that.context)) { + return false; + } + + if (route == null) { + if (that.getRoute() != null) { + return false; + } + } else if (!route.equals(that.route)) { + return false; + } + + if (type == null) { + if (that.getType() != null) { + return false; + } + } else if (!type.equals(that.type)) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 0; + result = prime * result + (context == null ? 0 : context.hashCode()); + result = prime * result + (type == null ? 0 : type.hashCode()); + result = prime * result + (route == null ? 0 : route.hashCode()); + return result; + } + + @Override + public String toString() { + return "RouteIdentifierImpl{" + "context=" + context + ", type=" + type + ", route=" + route + '}'; + } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java index 9f3fed4fd5..964a12bcf8 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java @@ -29,16 +29,12 @@ import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Actor to initiate execution of remote RPC on other nodes of the cluster. */ public class RpcBroker extends AbstractUntypedActor { - - private static final Logger LOG = LoggerFactory.getLogger(RpcBroker.class); private final DOMRpcService rpcService; private RpcBroker(final DOMRpcService rpcService) { @@ -57,6 +53,7 @@ public class RpcBroker extends AbstractUntypedActor { } } + @SuppressWarnings("checkstyle:IllegalCatch") private void executeRpc(final ExecuteRpc msg) { LOG.debug("Executing rpc {}", msg.getRpc()); final NormalizedNode input = RemoteRpcInput.from(msg.getInputNormalizedNode()); @@ -86,16 +83,17 @@ public class RpcBroker extends AbstractUntypedActor { } @Override - public void onFailure(final Throwable t) { - LOG.error("executeRpc for {} failed with root cause: {}. For exception details, enable Debug logging.", - msg.getRpc(), Throwables.getRootCause(t)); - if(LOG.isDebugEnabled()) { - LOG.debug("Detailed exception for execute RPC failure :{}", t); + public void onFailure(final Throwable failure) { + LOG.error( + "executeRpc for {} failed with root cause: {}. For exception details, enable Debug logging.", + msg.getRpc(), Throwables.getRootCause(failure)); + if (LOG.isDebugEnabled()) { + LOG.debug("Detailed exception for execute RPC failure :{}", failure); } - sender.tell(new akka.actor.Status.Failure(t), self); + sender.tell(new akka.actor.Status.Failure(failure), self); } }); - } catch (final Exception e) { + } catch (final RuntimeException e) { sender.tell(new akka.actor.Status.Failure(e), sender); } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcErrorsException.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcErrorsException.java index 8faa331e6f..7f2e0b148e 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcErrorsException.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcErrorsException.java @@ -55,7 +55,7 @@ public class RpcErrorsException extends DOMRpcException { public RpcErrorsException(final String message, final Iterable rpcErrors) { super(message); - for(final RpcError rpcError: rpcErrors) { + for (final RpcError rpcError: rpcErrors) { rpcErrorDataList.add(new RpcErrorData(rpcError.getSeverity(), rpcError.getErrorType(), rpcError.getTag(), rpcError.getApplicationTag(), rpcError.getMessage(), rpcError.getInfo(), rpcError.getCause())); @@ -64,11 +64,11 @@ public class RpcErrorsException extends DOMRpcException { public Collection getRpcErrors() { final Collection rpcErrors = new ArrayList<>(); - for(final RpcErrorData ed: rpcErrorDataList) { - final RpcError rpcError = ed.severity == ErrorSeverity.ERROR ? - RpcResultBuilder.newError(ed.errorType, ed.tag, ed.message, ed.applicationTag, + for (final RpcErrorData ed: rpcErrorDataList) { + final RpcError rpcError = ed.severity == ErrorSeverity.ERROR + ? RpcResultBuilder.newError(ed.errorType, ed.tag, ed.message, ed.applicationTag, ed.info, ed.cause) : - RpcResultBuilder.newWarning(ed.errorType, ed.tag, ed.message, ed.applicationTag, + RpcResultBuilder.newWarning(ed.errorType, ed.tag, ed.message, ed.applicationTag, ed.info, ed.cause); rpcErrors.add(rpcError); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java index 0d0335e18d..5b1c554799 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java @@ -22,14 +22,14 @@ import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RpcListener implements DOMRpcAvailabilityListener{ +public class RpcListener implements DOMRpcAvailabilityListener { - private static final Logger LOG = LoggerFactory.getLogger(RpcListener.class); - private final ActorRef rpcRegistry; + private static final Logger LOG = LoggerFactory.getLogger(RpcListener.class); + private final ActorRef rpcRegistry; - public RpcListener(final ActorRef rpcRegistry) { - this.rpcRegistry = rpcRegistry; - } + public RpcListener(final ActorRef rpcRegistry) { + this.rpcRegistry = rpcRegistry; + } @Override public void onRpcAvailable(@Nonnull final Collection rpcs) { @@ -40,7 +40,8 @@ public class RpcListener implements DOMRpcAvailabilityListener{ final List> routeIds = new ArrayList<>(); for (final DOMRpcIdentifier rpc : rpcs) { - final RpcRouter.RouteIdentifier routeId = new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference()); + final RpcRouter.RouteIdentifier routeId = + new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference()); routeIds.add(routeId); } final RpcRegistry.Messages.AddOrUpdateRoutes addRpcMsg = new RpcRegistry.Messages.AddOrUpdateRoutes(routeIds); @@ -50,12 +51,13 @@ public class RpcListener implements DOMRpcAvailabilityListener{ @Override public void onRpcUnavailable(@Nonnull final Collection rpcs) { Preconditions.checkArgument(rpcs != null, "Input Collection of DOMRpcIdentifier can not be null."); - if(LOG.isDebugEnabled()) { - LOG.debug("Removing registration for [{}]", rpcs); - } + + LOG.debug("Removing registration for [{}]", rpcs); + final List> routeIds = new ArrayList<>(); for (final DOMRpcIdentifier rpc : rpcs) { - final RpcRouter.RouteIdentifier routeId = new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference()); + final RpcRouter.RouteIdentifier routeId = + new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference()); routeIds.add(routeId); } final RpcRegistry.Messages.RemoveRoutes removeRpcMsg = new RpcRegistry.Messages.RemoveRoutes(routeIds); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java index fc75ea6089..8e53bcba83 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java @@ -13,6 +13,7 @@ import akka.actor.ActorRef; import akka.actor.OneForOneStrategy; import akka.actor.Props; import akka.actor.SupervisorStrategy; +import akka.actor.SupervisorStrategy.Directive; import akka.japi.Function; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -30,20 +31,14 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import scala.concurrent.duration.Duration; /** - * This class acts as a supervisor, creates all the actors, resumes them, if an exception is thrown. - * - * It also starts the rpc listeners + * This class acts as a supervisor, creates all the actors, resumes them, if an exception is thrown. It also starts + * the rpc listeners */ public class RpcManager extends AbstractUntypedActor { - - private static final Logger LOG = LoggerFactory.getLogger(RpcManager.class); - private SchemaContext schemaContext; private ActorRef rpcBroker; private ActorRef rpcRegistry; @@ -67,25 +62,22 @@ public class RpcManager extends AbstractUntypedActor { } - public static Props props(final SchemaContext schemaContext, - final DOMRpcProviderService rpcProvisionRegistry, final DOMRpcService rpcServices, - final RemoteRpcProviderConfig config) { - Preconditions.checkNotNull(schemaContext, "SchemaContext can not be null!"); - Preconditions.checkNotNull(rpcProvisionRegistry, "RpcProviderService can not be null!"); - Preconditions.checkNotNull(rpcServices, "RpcService can not be null!"); - return Props.create(RpcManager.class, schemaContext, rpcProvisionRegistry, rpcServices, config); - } + public static Props props(final SchemaContext schemaContext, final DOMRpcProviderService rpcProvisionRegistry, + final DOMRpcService rpcServices, final RemoteRpcProviderConfig config) { + Preconditions.checkNotNull(schemaContext, "SchemaContext can not be null!"); + Preconditions.checkNotNull(rpcProvisionRegistry, "RpcProviderService can not be null!"); + Preconditions.checkNotNull(rpcServices, "RpcService can not be null!"); + return Props.create(RpcManager.class, schemaContext, rpcProvisionRegistry, rpcServices, config); + } private void createRpcActors() { LOG.debug("Create rpc registry and broker actors"); - rpcRegistry = - getContext().actorOf(RpcRegistry.props(config). - withMailbox(config.getMailBoxName()), config.getRpcRegistryName()); + rpcRegistry = getContext().actorOf(RpcRegistry.props(config) + .withMailbox(config.getMailBoxName()), config.getRpcRegistryName()); - rpcBroker = - getContext().actorOf(RpcBroker.props(rpcServices). - withMailbox(config.getMailBoxName()), config.getRpcBrokerName()); + rpcBroker = getContext().actorOf(RpcBroker.props(rpcServices) + .withMailbox(config.getMailBoxName()), config.getRpcBrokerName()); final RpcRegistry.Messages.SetLocalRouter localRouter = new RpcRegistry.Messages.SetLocalRouter(rpcBroker); rpcRegistry.tell(localRouter, self()); @@ -106,9 +98,9 @@ public class RpcManager extends AbstractUntypedActor { private void registerRoutedRpcDelegate() { final Set rpcIdentifiers = new HashSet<>(); final Set modules = schemaContext.getModules(); - for(final Module module : modules){ - for(final RpcDefinition rpcDefinition : module.getRpcs()){ - if(RpcRoutingStrategy.from(rpcDefinition).isContextBasedRouted()) { + for (final Module module : modules) { + for (final RpcDefinition rpcDefinition : module.getRpcs()) { + if (RpcRoutingStrategy.from(rpcDefinition).isContextBasedRouted()) { LOG.debug("Adding routed rpcDefinition for path {}", rpcDefinition.getPath()); rpcIdentifiers.add(DOMRpcIdentifier.create(rpcDefinition.getPath(), YangInstanceIdentifier.EMPTY)); } @@ -118,16 +110,17 @@ public class RpcManager extends AbstractUntypedActor { } /** - * Add all the locally registered RPCs in the clustered routing table + * Add all the locally registered RPCs in the clustered routing table. */ - private void announceSupportedRpcs(){ + private void announceSupportedRpcs() { LOG.debug("Adding all supported rpcs to routing table"); final Set currentlySupportedRpc = schemaContext.getOperations(); final List rpcs = new ArrayList<>(); for (final RpcDefinition rpcDef : currentlySupportedRpc) { rpcs.add(DOMRpcIdentifier.create(rpcDef.getPath())); } - if(!rpcs.isEmpty()) { + + if (!rpcs.isEmpty()) { rpcListener.onRpcAvailable(rpcs); } } @@ -135,29 +128,23 @@ public class RpcManager extends AbstractUntypedActor { @Override protected void handleReceive(final Object message) throws Exception { - if(message instanceof UpdateSchemaContext) { - updateSchemaContext((UpdateSchemaContext) message); - } - + if (message instanceof UpdateSchemaContext) { + updateSchemaContext((UpdateSchemaContext) message); + } } private void updateSchemaContext(final UpdateSchemaContext message) { - schemaContext = message.getSchemaContext(); - registerRoutedRpcDelegate(); - rpcBroker.tell(message, ActorRef.noSender()); + schemaContext = message.getSchemaContext(); + registerRoutedRpcDelegate(); + rpcBroker.tell(message, ActorRef.noSender()); } @Override public SupervisorStrategy supervisorStrategy() { - return new OneForOneStrategy(10, Duration.create("1 minute"), - new Function() { - @Override - public SupervisorStrategy.Directive apply(final Throwable t) { - LOG.error("An exception happened actor will be resumed", t); + return new OneForOneStrategy(10, Duration.create("1 minute"), (Function) t -> { + LOG.error("An exception happened actor will be resumed", t); - return SupervisorStrategy.resume(); - } - } - ); + return SupervisorStrategy.resume(); + }); } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java index 13399f6f9d..c52ba2a747 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java @@ -14,22 +14,20 @@ import org.opendaylight.controller.cluster.common.actor.Monitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TerminationMonitor extends UntypedActor{ +public class TerminationMonitor extends UntypedActor { private static final Logger LOG = LoggerFactory.getLogger(TerminationMonitor.class); - public TerminationMonitor(){ + public TerminationMonitor() { LOG.debug("Created TerminationMonitor"); } @Override public void onReceive(Object message) throws Exception { - if(message instanceof Terminated){ + if (message instanceof Terminated) { Terminated terminated = (Terminated) message; - if(LOG.isDebugEnabled()) { - LOG.debug("Actor terminated : {}", terminated.actor()); - } - }else if(message instanceof Monitor){ - Monitor monitor = (Monitor) message; - getContext().watch(monitor.getActorRef()); + LOG.debug("Actor terminated : {}", terminated.actor()); + } else if (message instanceof Monitor) { + Monitor monitor = (Monitor) message; + getContext().watch(monitor.getActorRef()); } } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java index 7579a674c1..a5300a2722 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java @@ -22,10 +22,6 @@ import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -/** - * @author tony - * - */ public class ExecuteRpc implements Serializable { private static final long serialVersionUID = 1128904894827335676L; diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/UpdateSchemaContext.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/UpdateSchemaContext.java index 83fc7723b3..68302c5c39 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/UpdateSchemaContext.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/UpdateSchemaContext.java @@ -11,14 +11,13 @@ package org.opendaylight.controller.remote.rpc.messages; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class UpdateSchemaContext { + private final SchemaContext schemaContext; - private final SchemaContext schemaContext; + public UpdateSchemaContext(final SchemaContext schemaContext) { + this.schemaContext = schemaContext; + } - public UpdateSchemaContext(final SchemaContext schemaContext) { - this.schemaContext = schemaContext; - } - - public SchemaContext getSchemaContext() { - return schemaContext; - } + public SchemaContext getSchemaContext() { + return schemaContext; + } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java index fa93a3b83f..09a987f7e3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java @@ -14,7 +14,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Set; - import org.opendaylight.controller.remote.rpc.registry.gossip.Copier; import org.opendaylight.controller.sal.connector.api.RpcRouter; @@ -33,7 +32,7 @@ public class RoutingTable implements Copier, Serializable { return copy; } - public Option> getRouterFor(RpcRouter.RouteIdentifier routeId){ + public Option> getRouterFor(RpcRouter.RouteIdentifier routeId) { Long updatedTime = table.get(routeId); if (updatedTime == null || router == null) { @@ -47,19 +46,19 @@ public class RoutingTable implements Copier, Serializable { return table.keySet(); } - public void addRoute(RpcRouter.RouteIdentifier routeId){ + public void addRoute(RpcRouter.RouteIdentifier routeId) { table.put(routeId, System.currentTimeMillis()); } - public void removeRoute(RpcRouter.RouteIdentifier routeId){ + public void removeRoute(RpcRouter.RouteIdentifier routeId) { table.remove(routeId); } - public boolean contains(RpcRouter.RouteIdentifier routeId){ + public boolean contains(RpcRouter.RouteIdentifier routeId) { return table.containsKey(routeId); } - public boolean isEmpty(){ + public boolean isEmpty() { return table.isEmpty(); } @@ -77,9 +76,6 @@ public class RoutingTable implements Copier, Serializable { @Override public String toString() { - return "RoutingTable{" + - "table=" + table + - ", router=" + router + - '}'; + return "RoutingTable{" + "table=" + table + ", router=" + router + '}'; } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java index 1e481bc311..7c5efc29e8 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java @@ -27,7 +27,6 @@ import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.Remo import org.opendaylight.controller.remote.rpc.registry.RpcRegistry.Messages.SetLocalRouter; import org.opendaylight.controller.remote.rpc.registry.gossip.Bucket; import org.opendaylight.controller.remote.rpc.registry.gossip.BucketStore; -import org.opendaylight.controller.remote.rpc.registry.mbeans.RemoteRpcRegistryMXBean; import org.opendaylight.controller.remote.rpc.registry.mbeans.RemoteRpcRegistryMXBeanImpl; import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.opendaylight.controller.sal.connector.api.RpcRouter.RouteIdentifier; @@ -73,7 +72,7 @@ public class RpcRegistry extends BucketStore { } /** - * Register's rpc broker + * Registers a rpc broker. * * @param message contains {@link akka.actor.ActorRef} for rpc broker */ @@ -81,15 +80,12 @@ public class RpcRegistry extends BucketStore { getLocalBucket().getData().setRouter(message.getRouter()); } - /** - * @param msg - */ private void receiveAddRoutes(AddOrUpdateRoutes msg) { log.debug("AddOrUpdateRoutes: {}", msg.getRouteIdentifiers()); RoutingTable table = getLocalBucket().getData().copy(); - for(RpcRouter.RouteIdentifier routeId : msg.getRouteIdentifiers()) { + for (RpcRouter.RouteIdentifier routeId : msg.getRouteIdentifiers()) { table.addRoute(routeId); } @@ -99,6 +95,8 @@ public class RpcRegistry extends BucketStore { } /** + * Processes a RemoveRoutes message. + * * @param msg contains list of route ids to remove */ private void receiveRemoveRoutes(RemoveRoutes msg) { @@ -114,13 +112,13 @@ public class RpcRegistry extends BucketStore { /** * Finds routers for the given rpc. * - * @param findRouters + * @param findRouters the FindRouters request */ private void receiveGetRouter(final FindRouters findRouters) { log.debug("receiveGetRouter for {}", findRouters.getRouteIdentifier()); final ActorRef sender = getSender(); - if(!findRouters(findRouters, sender)) { + if (!findRouters(findRouters, sender)) { log.debug("No routers found for {} - scheduling {} ms timer", findRouters.getRouteIdentifier(), findRouterTimeout.toMillis()); @@ -128,7 +126,7 @@ public class RpcRegistry extends BucketStore { final Runnable routesUpdatedRunnable = new Runnable() { @Override public void run() { - if(findRouters(findRouters, sender)) { + if (findRouters(findRouters, sender)) { routesUpdatedCallbacks.remove(this); timer.get().cancel(); } @@ -137,15 +135,12 @@ public class RpcRegistry extends BucketStore { routesUpdatedCallbacks.add(routesUpdatedRunnable); - Runnable timerRunnable = new Runnable() { - @Override - public void run() { - log.warn("Timed out finding routers for {}", findRouters.getRouteIdentifier()); + Runnable timerRunnable = () -> { + log.warn("Timed out finding routers for {}", findRouters.getRouteIdentifier()); - routesUpdatedCallbacks.remove(routesUpdatedRunnable); - sender.tell(new Messages.FindRoutersReply( - Collections.>emptyList()), self()); - } + routesUpdatedCallbacks.remove(routesUpdatedRunnable); + sender.tell(new Messages.FindRoutersReply( + Collections.>emptyList()), self()); }; timer.set(getContext().system().scheduler().scheduleOnce(findRouterTimeout, self(), timerRunnable, @@ -159,14 +154,14 @@ public class RpcRegistry extends BucketStore { RouteIdentifier routeId = findRouters.getRouteIdentifier(); findRoutes(getLocalBucket().getData(), routeId, routers); - for(Bucket bucket : getRemoteBuckets().values()) { + for (Bucket bucket : getRemoteBuckets().values()) { findRoutes(bucket.getData(), routeId, routers); } log.debug("Found {} routers for {}", routers.size(), findRouters.getRouteIdentifier()); boolean foundRouters = !routers.isEmpty(); - if(foundRouters) { + if (foundRouters) { sender.tell(new Messages.FindRoutersReply(routers), getSelf()); } @@ -180,24 +175,24 @@ public class RpcRegistry extends BucketStore { } Option> routerWithUpdateTime = table.getRouterFor(routeId); - if(!routerWithUpdateTime.isEmpty()) { + if (!routerWithUpdateTime.isEmpty()) { routers.add(routerWithUpdateTime.get()); } } @Override protected void onBucketsUpdated() { - if(routesUpdatedCallbacks.isEmpty()) { + if (routesUpdatedCallbacks.isEmpty()) { return; } - for(Runnable callBack: routesUpdatedCallbacks.toArray(new Runnable[routesUpdatedCallbacks.size()])) { + for (Runnable callBack: routesUpdatedCallbacks.toArray(new Runnable[routesUpdatedCallbacks.size()])) { callBack.run(); } } /** - * All messages used by the RpcRegistry + * All messages used by the RpcRegistry. */ public static class Messages { @@ -206,9 +201,8 @@ public class RpcRegistry extends BucketStore { final List> routeIdentifiers; public ContainsRoute(List> routeIdentifiers) { - Preconditions.checkArgument(routeIdentifiers != null && - !routeIdentifiers.isEmpty(), - "Route Identifiers must be supplied"); + Preconditions.checkArgument(routeIdentifiers != null && !routeIdentifiers.isEmpty(), + "Route Identifiers must be supplied"); this.routeIdentifiers = routeIdentifiers; } @@ -218,9 +212,7 @@ public class RpcRegistry extends BucketStore { @Override public String toString() { - return "ContainsRoute{" + - "routeIdentifiers=" + routeIdentifiers + - '}'; + return "ContainsRoute{" + "routeIdentifiers=" + routeIdentifiers + '}'; } } @@ -252,9 +244,7 @@ public class RpcRegistry extends BucketStore { @Override public String toString() { - return "SetLocalRouter{" + - "router=" + router + - '}'; + return "SetLocalRouter{" + "router=" + router + '}'; } } @@ -272,9 +262,7 @@ public class RpcRegistry extends BucketStore { @Override public String toString() { - return "FindRouters{" + - "routeIdentifier=" + routeIdentifier + - '}'; + return "FindRouters{" + "routeIdentifier=" + routeIdentifier + '}'; } } @@ -292,9 +280,7 @@ public class RpcRegistry extends BucketStore { @Override public String toString() { - return "FindRoutersReply{" + - "routerWithUpdateTime=" + routerWithUpdateTime + - '}'; + return "FindRoutersReply{" + "routerWithUpdateTime=" + routerWithUpdateTime + '}'; } } } @@ -310,7 +296,7 @@ public class RpcRegistry extends BucketStore { @Override public RpcRegistry create() throws Exception { RpcRegistry registry = new RpcRegistry(config); - RemoteRpcRegistryMXBean mxBean = new RemoteRpcRegistryMXBeanImpl(registry); + new RemoteRpcRegistryMXBeanImpl(registry); return registry; } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java index 32c6dfeb55..998f5b1002 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Bucket.java @@ -7,8 +7,8 @@ */ package org.opendaylight.controller.remote.rpc.registry.gossip; - public interface Bucket> { Long getVersion(); + T getData(); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java index 4c4573d909..444faed6bd 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java @@ -30,7 +30,7 @@ public class BucketImpl> implements Bucket, Serializable public void setData(T data) { this.data = data; - this.version = System.currentTimeMillis()+1; + this.version = System.currentTimeMillis() + 1; } @Override @@ -45,9 +45,6 @@ public class BucketImpl> implements Bucket, Serializable @Override public String toString() { - return "BucketImpl{" + - "version=" + version + - ", data=" + data + - '}'; + return "BucketImpl{" + "version=" + version + ", data=" + data + '}'; } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java index 3ec56b7fca..81e6a9ccc3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java @@ -34,8 +34,9 @@ import org.slf4j.LoggerFactory; * A store that syncs its data across nodes in the cluster. * It maintains a {@link org.opendaylight.controller.remote.rpc.registry.gossip.Bucket} per node. Buckets are versioned. * A node can write ONLY to its bucket. This way, write conflicts are avoided. + * *

- * Buckets are sync'ed across nodes using Gossip protocol (http://en.wikipedia.org/wiki/Gossip_protocol)

+ * Buckets are sync'ed across nodes using Gossip protocol (http://en.wikipedia.org/wiki/Gossip_protocol). * This store uses a {@link org.opendaylight.controller.remote.rpc.registry.gossip.Gossiper}. * */ @@ -46,22 +47,22 @@ public class BucketStore> extends AbstractUntypedActorWithMe protected final Logger log = LoggerFactory.getLogger(getClass()); /** - * Bucket owned by the node + * Bucket owned by the node. */ private final BucketImpl localBucket = new BucketImpl<>(); /** - * Buckets ownded by other known nodes in the cluster + * Buckets ownded by other known nodes in the cluster. */ private final Map> remoteBuckets = new HashMap<>(); /** - * Bucket version for every known node in the cluster including this node + * Bucket version for every known node in the cluster including this node. */ private final Map versions = new HashMap<>(); /** - * Cluster address for this node + * Cluster address for this node. */ private Address selfAddress; @@ -69,12 +70,12 @@ public class BucketStore> extends AbstractUntypedActorWithMe private final RemoteRpcProviderConfig config; - public BucketStore(RemoteRpcProviderConfig config){ + public BucketStore(RemoteRpcProviderConfig config) { this.config = Preconditions.checkNotNull(config); } @Override - public void preStart(){ + public void preStart() { ActorRefProvider provider = getContext().provider(); selfAddress = provider.getDefaultAddress(); @@ -83,6 +84,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe } } + @SuppressWarnings("unchecked") @Override protected void handleReceive(Object message) throws Exception { if (probe != null) { @@ -104,9 +106,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe } else if (message instanceof UpdateRemoteBuckets) { receiveUpdateRemoteBuckets(((UpdateRemoteBuckets) message).getBuckets()); } else { - if(log.isDebugEnabled()) { - log.debug("Unhandled message [{}]", message); - } + log.debug("Unhandled message [{}]", message); unhandled(message); } } @@ -116,19 +116,19 @@ public class BucketStore> extends AbstractUntypedActorWithMe } /** - * Returns all the buckets the this node knows about, self owned + remote + * Returns all the buckets the this node knows about, self owned + remote. */ - void receiveGetAllBuckets(){ + void receiveGetAllBuckets() { final ActorRef sender = getSender(); sender.tell(new GetAllBucketsReply<>(getAllBuckets()), getSelf()); } /** - * Helper to collect all known buckets + * Helper to collect all known buckets. * * @return self owned + remote buckets */ - Map> getAllBuckets(){ + Map> getAllBuckets() { Map> all = new HashMap<>(remoteBuckets.size() + 1); //first add the local bucket @@ -141,21 +141,21 @@ public class BucketStore> extends AbstractUntypedActorWithMe } /** - * Returns buckets for requested members that this node knows about + * Returns buckets for requested members that this node knows about. * * @param members requested members */ - void receiveGetBucketsByMembers(Set

members){ + void receiveGetBucketsByMembers(Set
members) { final ActorRef sender = getSender(); Map> buckets = getBucketsByMembers(members); sender.tell(new GetBucketsByMembersReply<>(buckets), getSelf()); } /** - * Helper to collect buckets for requested memebers + * Helper to collect buckets for requested members. * * @param members requested members - * @return buckets for requested memebers + * @return buckets for requested members */ Map> getBucketsByMembers(Set
members) { Map> buckets = new HashMap<>(); @@ -166,7 +166,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe } //then get buckets for requested remote nodes - for (Address address : members){ + for (Address address : members) { if (remoteBuckets.containsKey(address)) { buckets.put(address, remoteBuckets.get(address)); } @@ -176,31 +176,30 @@ public class BucketStore> extends AbstractUntypedActorWithMe } /** - * Returns versions for all buckets known + * Returns versions for all buckets known. */ - void receiveGetBucketVersions(){ + void receiveGetBucketVersions() { final ActorRef sender = getSender(); GetBucketVersionsReply reply = new GetBucketVersionsReply(versions); sender.tell(reply, getSelf()); } /** - * Update local copy of remote buckets where local copy's version is older + * Update local copy of remote buckets where local copy's version is older. * * @param receivedBuckets buckets sent by remote * {@link org.opendaylight.controller.remote.rpc.registry.gossip.Gossiper} */ - void receiveUpdateRemoteBuckets(Map> receivedBuckets){ + void receiveUpdateRemoteBuckets(Map> receivedBuckets) { log.debug("{}: receiveUpdateRemoteBuckets: {}", selfAddress, receivedBuckets); - if (receivedBuckets == null || receivedBuckets.isEmpty()) - { + if (receivedBuckets == null || receivedBuckets.isEmpty()) { return; //nothing to do } //Remote cant update self's bucket receivedBuckets.remove(selfAddress); - for (Map.Entry> entry : receivedBuckets.entrySet()){ + for (Map.Entry> entry : receivedBuckets.entrySet()) { Long localVersion = versions.get(entry.getKey()); if (localVersion == null) { @@ -225,9 +224,7 @@ public class BucketStore> extends AbstractUntypedActorWithMe } } - if(log.isDebugEnabled()) { - log.debug("State after update - Local Bucket [{}], Remote Buckets [{}]", localBucket, remoteBuckets); - } + log.debug("State after update - Local Bucket [{}], Remote Buckets [{}]", localBucket, remoteBuckets); onBucketsUpdated(); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java index f597c316e5..9230591d46 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java @@ -18,6 +18,7 @@ import akka.cluster.ClusterEvent; import akka.cluster.Member; import akka.dispatch.Mapper; import akka.pattern.Patterns; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.HashSet; @@ -57,7 +58,6 @@ import scala.concurrent.duration.FiniteDuration; * for update. * */ - public class Gossiper extends AbstractUntypedActorWithMetering { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -70,7 +70,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { private Address selfAddress; /** - * All known cluster members + * All known cluster members. */ private List
clusterMembers = new ArrayList<>(); @@ -80,22 +80,24 @@ public class Gossiper extends AbstractUntypedActorWithMetering { private final RemoteRpcProviderConfig config; - public Gossiper(RemoteRpcProviderConfig config){ + public Gossiper(RemoteRpcProviderConfig config) { this.config = Preconditions.checkNotNull(config); } /** - * Helpful for testing + * Constructor for testing. + * * @param autoStartGossipTicks used for turning off gossip ticks during testing. * Gossip tick can be manually sent. */ - public Gossiper(Boolean autoStartGossipTicks, RemoteRpcProviderConfig config){ + @VisibleForTesting + public Gossiper(Boolean autoStartGossipTicks, RemoteRpcProviderConfig config) { this(config); this.autoStartGossipTicks = autoStartGossipTicks; } @Override - public void preStart(){ + public void preStart() { ActorRefProvider provider = getContext().provider(); selfAddress = provider.getDefaultAddress(); @@ -120,7 +122,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } @Override - public void postStop(){ + public void postStop() { if (cluster != null) { cluster.unsubscribe(getSelf()); } @@ -129,6 +131,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override protected void handleReceive(Object message) throws Exception { //Usually sent by self via gossip task defined above. But its not enforced. @@ -149,7 +152,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } else if (message instanceof ClusterEvent.MemberRemoved) { receiveMemberRemoveOrUnreachable(((ClusterEvent.MemberRemoved) message).member()); - } else if ( message instanceof ClusterEvent.UnreachableMember){ + } else if ( message instanceof ClusterEvent.UnreachableMember) { receiveMemberRemoveOrUnreachable(((ClusterEvent.UnreachableMember) message).member()); } else { @@ -164,20 +167,19 @@ public class Gossiper extends AbstractUntypedActorWithMetering { */ void receiveMemberRemoveOrUnreachable(Member member) { //if its self, then stop itself - if (selfAddress.equals(member.address())){ + if (selfAddress.equals(member.address())) { getContext().stop(getSelf()); return; } clusterMembers.remove(member.address()); - if(log.isDebugEnabled()) { - log.debug("Removed member [{}], Active member list [{}]", member.address(), clusterMembers); - } + log.debug("Removed member [{}], Active member list [{}]", member.address(), clusterMembers); } /** - * Add member to the local copy of member list if it doesnt already - * @param member + * Add member to the local copy of member list if it doesn't already. + * + * @param member the member to add */ void receiveMemberUp(Member member) { @@ -188,18 +190,18 @@ public class Gossiper extends AbstractUntypedActorWithMetering { if (!clusterMembers.contains(member.address())) { clusterMembers.add(member.address()); } - if(log.isDebugEnabled()) { - log.debug("Added member [{}], Active member list [{}]", member.address(), clusterMembers); - } + + log.debug("Added member [{}], Active member list [{}]", member.address(), clusterMembers); } /** - * Sends Gossip status to other members in the cluster.
- * 1. If there are no member, ignore the tick.
- * 2. If there's only 1 member, send gossip status (bucket versions) to it.
+ * Sends Gossip status to other members in the cluster. + *
+ * 1. If there are no member, ignore the tick.
+ * 2. If there's only 1 member, send gossip status (bucket versions) to it.
* 3. If there are more than one member, randomly pick one and send gossip status (bucket versions) to it. */ - void receiveGossipTick(){ + void receiveGossipTick() { if (clusterMembers.size() == 0) { return; //no members to send gossip status to } @@ -212,16 +214,15 @@ public class Gossiper extends AbstractUntypedActorWithMetering { Integer randomIndex = ThreadLocalRandom.current().nextInt(0, clusterMembers.size()); remoteMemberToGossipTo = clusterMembers.get(randomIndex); } - if(log.isTraceEnabled()) { - log.trace("Gossiping to [{}]", remoteMemberToGossipTo); - } + + log.trace("Gossiping to [{}]", remoteMemberToGossipTo); getLocalStatusAndSendTo(remoteMemberToGossipTo); } /** * Process gossip status received from a remote gossiper. Remote versions are compared with - * the local copy.

- * + * the local copy. + *

* For each bucket *

    *
  • If local copy is newer, the newer buckets are sent in GossipEnvelope to remote
    • @@ -231,7 +232,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { * * @param status bucket versions from a remote member */ - void receiveGossipStatus(GossipStatus status){ + void receiveGossipStatus(GossipStatus status) { //Don't accept messages from non-members if (!clusterMembers.contains(status.from())) { return; @@ -250,11 +251,12 @@ public class Gossiper extends AbstractUntypedActorWithMetering { * * @param envelope contains buckets from a remote gossiper */ - void receiveGossip(GossipEnvelope envelope){ + > void receiveGossip(GossipEnvelope envelope) { //TODO: Add more validations if (!selfAddress.equals(envelope.to())) { - if(log.isTraceEnabled()) { - log.trace("Ignoring message intended for someone else. From [{}] to [{}]", envelope.from(), envelope.to()); + if (log.isTraceEnabled()) { + log.trace("Ignoring message intended for someone else. From [{}] to [{}]", envelope.from(), + envelope.to()); } return; } @@ -264,23 +266,22 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } /** - * Helper to send received buckets to bucket store + * Helper to send received buckets to bucket store. * - * @param buckets + * @param buckets map of Buckets to update */ - void updateRemoteBuckets(Map buckets) { - - UpdateRemoteBuckets updateRemoteBuckets = new UpdateRemoteBuckets(buckets); + > void updateRemoteBuckets(Map> buckets) { + UpdateRemoteBuckets updateRemoteBuckets = new UpdateRemoteBuckets<>(buckets); getContext().parent().tell(updateRemoteBuckets, getSelf()); } /** - * Gets the buckets from bucket store for the given node addresses and sends them to remote gossiper + * Gets the buckets from bucket store for the given node addresses and sends them to remote gossiper. * * @param remote remote node to send Buckets to * @param addresses node addresses whose buckets needs to be sent */ - void sendGossipTo(final ActorRef remote, final Set
    addresses){ + void sendGossipTo(final ActorRef remote, final Set
    addresses) { Future futureReply = Patterns.ask(getContext().parent(), new GetBucketsByMembers(addresses), config.getAskDuration()); @@ -288,11 +289,11 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } /** - * Gets bucket versions from bucket store and sends to the supplied address + * Gets bucket versions from bucket store and sends to the supplied address. * * @param remoteActorSystemAddress remote gossiper to send to */ - void getLocalStatusAndSendTo(Address remoteActorSystemAddress){ + void getLocalStatusAndSendTo(Address remoteActorSystemAddress) { //Get local status from bucket store and send to remote Future futureReply = @@ -302,26 +303,25 @@ public class Gossiper extends AbstractUntypedActorWithMetering { ActorSelection remoteRef = getContext().system().actorSelection( remoteActorSystemAddress.toString() + getSelf().path().toStringWithoutAddress()); - if(log.isTraceEnabled()) { - log.trace("Sending bucket versions to [{}]", remoteRef); - } + log.trace("Sending bucket versions to [{}]", remoteRef); futureReply.map(getMapperToSendLocalStatus(remoteRef), getContext().dispatcher()); } /** - * Helper to send bucket versions received from local store + * Helper to send bucket versions received from local store. + * * @param remote remote gossiper to send versions to * @param localVersions bucket versions received from local store */ - void sendGossipStatusTo(ActorRef remote, Map localVersions){ + void sendGossipStatusTo(ActorRef remote, Map localVersions) { GossipStatus status = new GossipStatus(selfAddress, localVersions); remote.tell(status, getSelf()); } - void sendGossipStatusTo(ActorSelection remote, Map localVersions){ + void sendGossipStatusTo(ActorSelection remote, Map localVersions) { GossipStatus status = new GossipStatus(selfAddress, localVersions); remote.tell(status, getSelf()); @@ -331,7 +331,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { /// Private factories to create mappers /// - private Mapper getMapperToSendLocalStatus(final ActorSelection remote){ + private Mapper getMapperToSendLocalStatus(final ActorSelection remote) { return new Mapper() { @Override @@ -366,7 +366,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { * @return a {@link akka.dispatch.Mapper} that gets evaluated in future * */ - private Mapper getMapperToProcessRemoteStatus(final ActorRef sender, final GossipStatus status){ + private Mapper getMapperToProcessRemoteStatus(final ActorRef sender, final GossipStatus status) { final Map remoteVersions = status.getVersions(); @@ -388,7 +388,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { localIsNewer.removeAll(remoteVersions.keySet()); - for (Address address : remoteVersions.keySet()){ + for (Address address : remoteVersions.keySet()) { if (localVersions.get(address) == null || remoteVersions.get(address) == null) { continue; //this condition is taken care of by above diffs @@ -421,21 +421,20 @@ public class Gossiper extends AbstractUntypedActorWithMetering { * {@link org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipEnvelope} * * @param sender the remote member that sent - * {@link org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipStatus} - * in reply to which bucket is being sent back + * {@link org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipStatus} + * in reply to which bucket is being sent back * @return a {@link akka.dispatch.Mapper} that gets evaluated in future * */ private Mapper getMapperToSendGossip(final ActorRef sender) { return new Mapper() { + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Void apply(Object msg) { if (msg instanceof GetBucketsByMembersReply) { - Map buckets = ((GetBucketsByMembersReply) msg).getBuckets(); - if(log.isTraceEnabled()) { - log.trace("Buckets to send from {}: {}", selfAddress, buckets); - } + Map> buckets = ((GetBucketsByMembersReply) msg).getBuckets(); + log.trace("Buckets to send from {}: {}", selfAddress, buckets); GossipEnvelope envelope = new GossipEnvelope(selfAddress, sender.path().address(), buckets); sender.tell(envelope, getSelf()); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java index 4034d7f853..99a94e70e9 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java @@ -25,17 +25,17 @@ import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketSto */ public class Messages { - public static class BucketStoreMessages{ + public static class BucketStoreMessages { public static class GetAllBuckets implements Serializable { private static final long serialVersionUID = 1L; } - public static class GetBucketsByMembers implements Serializable{ + public static class GetBucketsByMembers implements Serializable { private static final long serialVersionUID = 1L; private final Set
    members; - public GetBucketsByMembers(Set
    members){ + public GetBucketsByMembers(Set
    members) { Preconditions.checkArgument(members != null, "members can not be null"); this.members = members; } @@ -45,12 +45,12 @@ public class Messages { } } - public static class ContainsBuckets> implements Serializable{ + public static class ContainsBuckets> implements Serializable { private static final long serialVersionUID = -4940160367495308286L; private final Map> buckets; - public ContainsBuckets(Map> buckets){ + public ContainsBuckets(Map> buckets) { Preconditions.checkArgument(buckets != null, "buckets can not be null"); this.buckets = buckets; } @@ -58,9 +58,9 @@ public class Messages { public Map> getBuckets() { Map> copy = new HashMap<>(buckets.size()); - for (Map.Entry> entry : buckets.entrySet()){ + for (Map.Entry> entry : buckets.entrySet()) { //ignore null entries - if ( (entry.getKey() == null) || (entry.getValue() == null) ) { + if ( entry.getKey() == null || entry.getValue() == null ) { continue; } copy.put(entry.getKey(), entry.getValue()); @@ -69,15 +69,18 @@ public class Messages { } } - public static class GetAllBucketsReply> extends ContainsBuckets implements Serializable{ + public static class GetAllBucketsReply> extends ContainsBuckets implements Serializable { private static final long serialVersionUID = 1L; + public GetAllBucketsReply(Map> buckets) { super(buckets); } } - public static class GetBucketsByMembersReply> extends ContainsBuckets implements Serializable{ + public static class GetBucketsByMembersReply> extends ContainsBuckets + implements Serializable { private static final long serialVersionUID = 1L; + public GetBucketsByMembersReply(Map> buckets) { super(buckets); } @@ -87,7 +90,7 @@ public class Messages { private static final long serialVersionUID = 1L; } - public static class ContainsBucketVersions implements Serializable{ + public static class ContainsBucketVersions implements Serializable { private static final long serialVersionUID = -8172148925383801613L; Map versions; @@ -104,22 +107,25 @@ public class Messages { } - public static class GetBucketVersionsReply extends ContainsBucketVersions implements Serializable{ + public static class GetBucketVersionsReply extends ContainsBucketVersions implements Serializable { private static final long serialVersionUID = 1L; + public GetBucketVersionsReply(Map versions) { super(versions); } } - public static class UpdateRemoteBuckets> extends ContainsBuckets implements Serializable{ + public static class UpdateRemoteBuckets> extends ContainsBuckets + implements Serializable { private static final long serialVersionUID = 1L; + public UpdateRemoteBuckets(Map> buckets) { super(buckets); } } } - public static class GossiperMessages{ + public static class GossiperMessages { public static class Tick implements Serializable { private static final long serialVersionUID = -4770935099506366773L; } @@ -128,7 +134,7 @@ public class Messages { private static final long serialVersionUID = 5803354404380026143L; } - public static final class GossipStatus extends ContainsBucketVersions implements Serializable{ + public static final class GossipStatus extends ContainsBucketVersions implements Serializable { private static final long serialVersionUID = -593037395143883265L; private final Address from; @@ -143,7 +149,8 @@ public class Messages { } } - public static final class GossipEnvelope> extends ContainsBuckets implements Serializable { + public static final class GossipEnvelope> extends ContainsBuckets + implements Serializable { private static final long serialVersionUID = 8346634072582438818L; private final Address from; diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBean.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBean.java index 55ff332226..ea54e67b06 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBean.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBean.java @@ -13,9 +13,8 @@ import java.util.Map; import java.util.Set; /** - * JMX bean to check remote rpc registry + * JMX bean to check remote rpc registry. */ - public interface RemoteRpcRegistryMXBean { Set getGlobalRpc(); 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 684bb158ab..c0bdbb8d21 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 @@ -9,6 +9,10 @@ package org.opendaylight.controller.remote.rpc.registry.mbeans; import akka.actor.Address; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +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; @@ -17,23 +21,18 @@ import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements RemoteRpcRegistryMXBean { protected final Logger log = LoggerFactory.getLogger(getClass()); - private final String NULL_CONSTANT = "null"; + private static final String NULL_CONSTANT = "null"; - private final String LOCAL_CONSTANT = "local"; + private static final String LOCAL_CONSTANT = "local"; - private final String ROUTE_CONSTANT = "route:"; + private static final String ROUTE_CONSTANT = "route:"; - private final String NAME_CONSTANT = " | name:"; + private static final String NAME_CONSTANT = " | name:"; private final RpcRegistry rpcRegistry; @@ -47,14 +46,13 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot 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) { + for (RpcRouter.RouteIdentifier route : table.getRoutes()) { + if (route.getRoute() == null) { globalRpc.add(route.getType() != null ? route.getType().toString() : NULL_CONSTANT); } } - if(log.isDebugEnabled()) { - log.debug("Locally registered global RPCs {}", globalRpc); - } + + log.debug("Locally registered global RPCs {}", globalRpc); return globalRpc; } @@ -62,17 +60,16 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot 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) { + 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); + builder.append(route.getRoute().toString()).append(NAME_CONSTANT).append(route.getType() != null + ? route.getType().toString() : NULL_CONSTANT); routedRpc.add(builder.toString()); } } - if(log.isDebugEnabled()) { - log.debug("Locally registered routed RPCs {}", routedRpc); - } + + log.debug("Locally registered routed RPCs {}", routedRpc); return routedRpc; } @@ -84,13 +81,12 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot // Get all RPCs from remote bucket Map> buckets = rpcRegistry.getRemoteBuckets(); - for(Address address : buckets.keySet()) { + for (Address address : buckets.keySet()) { RoutingTable table = buckets.get(address).getData(); rpcMap.putAll(getRpcMemberMapByName(table, name, address.toString())); } - if(log.isDebugEnabled()) { - log.debug("list of RPCs {} searched by name {}", rpcMap, name); - } + + log.debug("list of RPCs {} searched by name {}", rpcMap, name); return rpcMap; } @@ -100,32 +96,30 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot Map rpcMap = new HashMap<>(getRpcMemberMapByRoute(localTable, routeId, LOCAL_CONSTANT)); Map> buckets = rpcRegistry.getRemoteBuckets(); - for(Address address : buckets.keySet()) { + for (Address address : buckets.keySet()) { RoutingTable table = buckets.get(address).getData(); rpcMap.putAll(getRpcMemberMapByRoute(table, routeId, address.toString())); } - if(log.isDebugEnabled()) { - log.debug("list of RPCs {} searched by route {}", rpcMap, routeId); - } + + log.debug("list of RPCs {} searched by route {}", rpcMap, routeId); return rpcMap; } /** - * Search if the routing table route String contains routeName + * 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(); Map rpcMap = new HashMap<>(routes.size()); - for(RpcRouter.RouteIdentifier route : table.getRoutes()){ - if(route.getRoute() != null) { + for (RpcRouter.RouteIdentifier route : table.getRoutes()) { + if (route.getRoute() != null) { String routeString = route.getRoute().toString(); - if(routeString.contains(routeName)) { + 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); + builder.append(routeString).append(NAME_CONSTANT).append(route.getType() != null + ? route.getType().toString() : NULL_CONSTANT); rpcMap.put(builder.toString(), address); } } @@ -134,18 +128,18 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot } /** - * Search if the routing table route type contains name + * 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(); Map rpcMap = new HashMap<>(routes.size()); - for(RpcRouter.RouteIdentifier route : routes){ - if(route.getType() != null) { + for (RpcRouter.RouteIdentifier route : routes) { + if (route.getType() != null) { String type = route.getType().toString(); - if(type.contains(name)) { + if (type.contains(name)) { StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(route.getRoute() != null ? route.getRoute().toString(): NULL_CONSTANT) + builder.append(route.getRoute() != null ? route.getRoute().toString() : NULL_CONSTANT) .append(NAME_CONSTANT).append(type); rpcMap.put(builder.toString(), address); } @@ -154,11 +148,8 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot return rpcMap; } - - @Override public String getBucketVersions() { return rpcRegistry.getVersions().toString(); } - -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java index f01baf009b..c0e2973aab 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java @@ -11,52 +11,49 @@ package org.opendaylight.controller.remote.rpc.utils; import akka.actor.ActorRef; import akka.japi.Pair; import com.google.common.base.Preconditions; - import java.util.Collection; import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; /** - * This class will return First Entry + * This class will return First Entry. */ -public class LatestEntryRoutingLogic implements RoutingLogic{ +public class LatestEntryRoutingLogic implements RoutingLogic { - private SortedSet> actorRefSet; + private final SortedSet> actorRefSet; - public LatestEntryRoutingLogic(Collection> entries) { - Preconditions.checkNotNull(entries, "Entries should not be null"); - Preconditions.checkArgument(!entries.isEmpty(), "Entries collection should not be empty"); + public LatestEntryRoutingLogic(Collection> entries) { + Preconditions.checkNotNull(entries, "Entries should not be null"); + Preconditions.checkArgument(!entries.isEmpty(), "Entries collection should not be empty"); - actorRefSet = new TreeSet<>(new LatestEntryComparator()); - actorRefSet.addAll(entries); - } + actorRefSet = new TreeSet<>(new LatestEntryComparator()); + actorRefSet.addAll(entries); + } - @Override - public ActorRef select() { - return actorRefSet.last().first(); - } + @Override + public ActorRef select() { + return actorRefSet.last().first(); + } + private class LatestEntryComparator implements Comparator> { - private class LatestEntryComparator implements Comparator> { + @Override + public int compare(Pair o1, Pair o2) { + if (o1 == null && o2 == null) { + return 0; + } + if (o1 == null && o2 != null) { + return -1; + } + if (o1 != null && o2 == null) { + return 1; + } - @Override - public int compare(Pair o1, Pair o2) { - if(o1 == null && o2 == null) { - return 0; - } - if(o1 == null && o2 != null) { - return -1; - } - if(o1 != null && o2 == null) { - return 1; - } - - return o1.second().compareTo(o2.second()); + return o1.second().compareTo(o2.second()); + } } - - } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/RoutingLogic.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/RoutingLogic.java index 4de71949fc..c7096f5280 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/RoutingLogic.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/RoutingLogic.java @@ -13,11 +13,9 @@ import akka.actor.ActorRef; /** * This Interface is added to abstract out the way rpc execution could be * routed, if more than one node in cluster is capable of executing the rpc. - * * We can pick node randomly, round robin manner or based on last updated time etc. */ public interface RoutingLogic { - - ActorRef select(); + ActorRef select(); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/utils/ConditionalProbe.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/utils/ConditionalProbe.java index dde1861a06..462a514ac9 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/utils/ConditionalProbe.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/utils/ConditionalProbe.java @@ -23,8 +23,8 @@ public class ConditionalProbe { this.predicate = predicate; } - public void tell(Object message, ActorRef sender){ - if(predicate.apply(message)) { + public void tell(Object message, ActorRef sender) { + if (predicate.apply(message)) { log.info("sending message to probe {}", message); actorRef.tell(message, sender); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java index 431c4a86ed..afe351f2a0 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java @@ -64,7 +64,8 @@ public class AbstractRpcTest { static final SchemaPath TEST_RPC_TYPE = SchemaPath.create(true, TEST_RPC); - static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(TEST_RPC)); + static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.create( + new YangInstanceIdentifier.NodeIdentifier(TEST_RPC)); public static final DOMRpcIdentifier TEST_RPC_ID = DOMRpcIdentifier.create(TEST_RPC_TYPE, TEST_PATH); static ActorSystem node1; @@ -129,8 +130,8 @@ public class AbstractRpcTest { } static void assertRpcErrorEquals(final RpcError rpcError, final ErrorSeverity severity, - final ErrorType errorType, final String tag, final String message, final String applicationTag, final String info, - final String causeMsg) { + final ErrorType errorType, final String tag, final String message, final String applicationTag, + final String info, final String causeMsg) { assertEquals("getSeverity", severity, rpcError.getSeverity()); assertEquals("getErrorType", errorType, rpcError.getErrorType()); assertEquals("getTag", tag, rpcError.getTag()); @@ -138,14 +139,14 @@ public class AbstractRpcTest { assertEquals("getApplicationTag", applicationTag, rpcError.getApplicationTag()); assertEquals("getInfo", info, rpcError.getInfo()); - if(causeMsg == null) { + if (causeMsg == null) { assertNull("Unexpected cause " + rpcError.getCause(), rpcError.getCause()); } else { assertEquals("Cause message", causeMsg, rpcError.getCause().getMessage()); } } - static void assertCompositeNodeEquals(final NormalizedNode exp, final NormalizedNode actual) { + static void assertCompositeNodeEquals(final NormalizedNode exp, final NormalizedNode actual) { assertEquals(exp, actual); } @@ -161,9 +162,8 @@ public class AbstractRpcTest { } static void assertFailedRpcResult(final DOMRpcResult rpcResult, final ErrorSeverity severity, - final ErrorType errorType, final String tag, final String message, final String applicationTag, final String info, - final String causeMsg) { - + final ErrorType errorType, final String tag, final String message, final String applicationTag, + final String info, final String causeMsg) { assertNotNull("RpcResult was null", rpcResult); final Collection rpcErrors = rpcResult.getErrors(); assertEquals("RpcErrors count", 1, rpcErrors.size()); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java index 8d6e8e598d..05ee9f5096 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcImplementationTest.java @@ -36,7 +36,7 @@ import org.opendaylight.controller.sal.connector.api.RpcRouter.RouteIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -/*** +/** * Unit tests for RemoteRpcImplementation. * * @author Thomas Pantelis @@ -57,7 +57,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { /** - * This test method invokes and executes the remote rpc + * This test method invokes and executes the remote rpc. */ @Test public void testInvokeRpc() throws Exception { @@ -88,7 +88,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { } /** - * This test method invokes and executes the remote rpc + * This test method invokes and executes the remote rpc. */ @Test public void testInvokeRpcWithNullInput() throws Exception { @@ -119,7 +119,7 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { /** - * This test method invokes and executes the remote rpc + * This test method invokes and executes the remote rpc. */ @Test public void testInvokeRpcWithNoOutput() throws Exception { @@ -151,21 +151,18 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { /** - * This test method invokes and executes the remote rpc + * This test method invokes and executes the remote rpc. */ @Test(expected = DOMRpcException.class) public void testInvokeRpcWithRemoteFailedFuture() throws Exception { - final ContainerNode rpcOutput = null; - final DOMRpcResult rpcResult = new DefaultDOMRpcResult(rpcOutput); - final NormalizedNode invokeRpcInput = makeRPCInput("foo"); @SuppressWarnings({"unchecked", "rawtypes"}) final ArgumentCaptor> inputCaptor = (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); when(domRpcService2.invokeRpc(eq(TEST_RPC_TYPE), inputCaptor.capture())).thenReturn( - Futures.immediateFailedCheckedFuture(new DOMRpcException( - "Test Exception") {})); + Futures.immediateFailedCheckedFuture(new RemoteDOMRpcException( + "Test Exception", null))); final CheckedFuture frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); @@ -182,18 +179,12 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { /** * This test method invokes and tests exceptions when akka timeout occured - * - * Currently ignored since this test with current config takes around 15 seconds - * to complete. - * + * Currently ignored since this test with current config takes around 15 seconds to complete. */ @Ignore @Test(expected = RemoteDOMRpcException.class) public void testInvokeRpcWithAkkaTimeoutException() throws Exception { final NormalizedNode invokeRpcInput = makeRPCInput("foo"); - @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = - (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); final CheckedFuture frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture); @@ -212,9 +203,6 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { @Test(expected = DOMRpcException.class) public void testInvokeRpcWithLookupException() throws Exception { final NormalizedNode invokeRpcInput = makeRPCInput("foo"); - @SuppressWarnings({"unchecked", "rawtypes"}) - final ArgumentCaptor> inputCaptor = - (ArgumentCaptor) ArgumentCaptor.forClass(NormalizedNode.class); final CheckedFuture frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); assertTrue(frontEndFuture instanceof RemoteDOMRpcFuture); @@ -227,18 +215,14 @@ public class RemoteRpcImplementationTest extends AbstractRpcTest { } /** - * This test method invokes and executes the remote rpc + * This test method invokes and executes the remote rpc. */ @Test(expected = DOMRpcImplementationNotAvailableException.class) public void testInvokeRpcWithLoopException() throws Exception { final NormalizedNode invokeRpcInput = RemoteRpcInput.from(makeRPCInput("foo")); - final CheckedFuture frontEndFuture = remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); + final CheckedFuture frontEndFuture = + remoteRpcImpl1.invokeRpc(TEST_RPC_ID, invokeRpcInput); frontEndFuture.checkedGet(5, TimeUnit.SECONDS); } - - - private RemoteRpcProviderConfig getConfig() { - return new RemoteRpcProviderConfig.Builder("unit-test").build(); - } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java index ae75252368..8ec5d7af6b 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java @@ -13,20 +13,16 @@ import akka.actor.UntypedActor; import akka.testkit.TestActorRef; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; +import java.util.concurrent.TimeUnit; import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.common.actor.AkkaConfigurationReader; import scala.concurrent.duration.FiniteDuration; -import java.io.File; -import java.util.concurrent.TimeUnit; - public class RemoteRpcProviderConfigTest { @Test public void testConfigDefaults() { - - Config c = ConfigFactory.parseFile(new File("application.conf")); RemoteRpcProviderConfig config = new RemoteRpcProviderConfig.Builder("unit-test").build(); //Assert on configurations from common config @@ -45,9 +41,6 @@ public class RemoteRpcProviderConfigTest { Assert.assertNotNull(config.getRpcRegistryPath()); Assert.assertNotNull(config.getAskDuration()); Assert.assertNotNull(config.getGossipTickInterval()); - - - } @Test @@ -87,7 +80,7 @@ public class RemoteRpcProviderConfigTest { public static class ConfigTestActor extends UntypedActor { - private Config actorSystemConfig; + private final Config actorSystemConfig; public ConfigTestActor() { this.actorSystemConfig = getContext().system().settings().config(); @@ -99,8 +92,6 @@ public class RemoteRpcProviderConfigTest { /** * Only for testing. NEVER expose actor's internal state like this. - * - * @return */ public Config getConfig() { return actorSystemConfig; @@ -115,4 +106,4 @@ public class RemoteRpcProviderConfigTest { } } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java index e1f93f8b39..e8ea373d48 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java @@ -31,23 +31,22 @@ import scala.concurrent.Await; import scala.concurrent.duration.Duration; public class RemoteRpcProviderTest { + static ActorSystem system; + static RemoteRpcProviderConfig moduleConfig; - static ActorSystem system; - static RemoteRpcProviderConfig moduleConfig; + @BeforeClass + public static void setup() throws InterruptedException { + moduleConfig = new RemoteRpcProviderConfig.Builder("odl-cluster-rpc").build(); + final Config config = moduleConfig.get(); + system = ActorSystem.create("odl-cluster-rpc", config); - @BeforeClass - public static void setup() throws InterruptedException { - moduleConfig = new RemoteRpcProviderConfig.Builder("odl-cluster-rpc").build(); - final Config config = moduleConfig.get(); - system = ActorSystem.create("odl-cluster-rpc", config); - - } + } - @AfterClass - public static void teardown() { - JavaTestKit.shutdownActorSystem(system); - system = null; - } + @AfterClass + public static void teardown() { + JavaTestKit.shutdownActorSystem(system); + system = null; + } @Test public void testRemoteRpcProvider() throws Exception { diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java index 88b65f2708..a553ab9ac3 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java @@ -53,14 +53,11 @@ public class RpcBrokerTest extends AbstractRpcTest { @Test public void testExecuteRpcFailureWithException() { - new JavaTestKit(node1) { { - when(domRpcService1.invokeRpc(eq(TEST_RPC_TYPE), Mockito.>any())) - .thenReturn( - Futures.immediateFailedCheckedFuture(new DOMRpcImplementationNotAvailableException( - "NOT FOUND"))); + .thenReturn(Futures.immediateFailedCheckedFuture( + new DOMRpcImplementationNotAvailableException("NOT FOUND"))); final ExecuteRpc executeMsg = ExecuteRpc.from(TEST_RPC_ID, null); @@ -71,7 +68,5 @@ public class RpcBrokerTest extends AbstractRpcTest { Assert.assertTrue(rpcResponse.cause() instanceof DOMRpcException); } }; - } - } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java index 772dae232f..a9370931ab 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistryTest.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.remote.rpc.registry; import static org.junit.Assert.fail; + import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Address; @@ -23,7 +24,6 @@ import akka.testkit.JavaTestKit; import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import java.net.URI; import java.net.URISyntaxException; @@ -56,10 +56,13 @@ import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketSto import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.opendaylight.controller.sal.connector.api.RpcRouter.RouteIdentifier; import org.opendaylight.yangtools.yang.common.QName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; public class RpcRegistryTest { + private static final Logger LOG = LoggerFactory.getLogger(RpcRegistryTest.class); private static ActorSystem node1; private static ActorSystem node2; @@ -73,15 +76,10 @@ public class RpcRegistryTest { @BeforeClass public static void staticSetup() throws InterruptedException { - AkkaConfigurationReader reader = new AkkaConfigurationReader() { - @Override - public Config read() { - return ConfigFactory.load(); - } - }; + AkkaConfigurationReader reader = () -> ConfigFactory.load(); - RemoteRpcProviderConfig config1 = new RemoteRpcProviderConfig.Builder("memberA").gossipTickInterval("200ms"). - withConfigReader(reader).build(); + RemoteRpcProviderConfig config1 = new RemoteRpcProviderConfig.Builder("memberA").gossipTickInterval("200ms") + .withConfigReader(reader).build(); RemoteRpcProviderConfig config2 = new RemoteRpcProviderConfig.Builder("memberB").gossipTickInterval("200ms") .withConfigReader(reader).build(); RemoteRpcProviderConfig config3 = new RemoteRpcProviderConfig.Builder("memberC").gossipTickInterval("200ms") @@ -97,11 +95,11 @@ public class RpcRegistryTest { static void waitForMembersUp(ActorSystem node, UniqueAddress... addresses) { Set otherMembersSet = Sets.newHashSet(addresses); Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.SECONDS) <= 10) { + while (sw.elapsed(TimeUnit.SECONDS) <= 10) { CurrentClusterState state = Cluster.get(node).state(); - for(Member m: state.getMembers()) { - if(m.status() == MemberStatus.up() && otherMembersSet.remove(m.uniqueAddress()) && - otherMembersSet.isEmpty()) { + for (Member m : state.getMembers()) { + if (m.status() == MemberStatus.up() && otherMembersSet.remove(m.uniqueAddress()) + && otherMembersSet.isEmpty()) { return; } } @@ -126,7 +124,7 @@ public class RpcRegistryTest { registry3 = node3.actorOf(Props.create(RpcRegistry.class, config(node3))); } - private RemoteRpcProviderConfig config(ActorSystem node){ + private RemoteRpcProviderConfig config(ActorSystem node) { return new RemoteRpcProviderConfig(node.settings().config()); } @@ -146,14 +144,10 @@ public class RpcRegistryTest { /** * One node cluster. 1. Register rpc, ensure router can be found 2. Then remove rpc, ensure its * deleted - * - * @throws URISyntaxException - * @throws InterruptedException */ @Test public void testAddRemoveRpcOnSameNode() throws Exception { - - System.out.println("testAddRemoveRpcOnSameNode starting"); + LOG.info("testAddRemoveRpcOnSameNode starting"); final JavaTestKit mockBroker = new JavaTestKit(node1); @@ -182,21 +176,18 @@ public class RpcRegistryTest { verifyEmptyBucket(mockBroker, registry1, nodeAddress); - System.out.println("testAddRemoveRpcOnSameNode ending"); + LOG.info("testAddRemoveRpcOnSameNode ending"); } /** * Three node cluster. 1. Register rpc on 1 node, ensure 2nd node gets updated 2. Remove rpc on * 1 node, ensure 2nd node gets updated - * - * @throws URISyntaxException - * @throws InterruptedException */ @Test public void testRpcAddRemoveInCluster() throws Exception { - System.out.println("testRpcAddRemoveInCluster starting"); + LOG.info("testRpcAddRemoveInCluster starting"); final JavaTestKit mockBroker1 = new JavaTestKit(node1); final JavaTestKit mockBroker2 = new JavaTestKit(node2); @@ -222,21 +213,21 @@ public class RpcRegistryTest { verifyEmptyBucket(mockBroker2, registry2, node1Address); - System.out.println("testRpcAddRemoveInCluster ending"); + LOG.info("testRpcAddRemoveInCluster ending"); } private void verifyEmptyBucket(JavaTestKit testKit, ActorRef registry, Address address) throws AssertionError { Map> buckets; - int nTries = 0; - while(true) { + int numTries = 0; + while (true) { buckets = retrieveBuckets(registry1, testKit, address); try { verifyBucket(buckets.get(address), Collections.>emptyList()); break; } catch (AssertionError e) { - if(++nTries >= 50) { + if (++numTries >= 50) { throw e; } } @@ -247,8 +238,6 @@ public class RpcRegistryTest { /** * Three node cluster. Register rpc on 2 nodes. Ensure 3rd gets updated. - * - * @throws Exception */ @Test public void testRpcAddedOnMultiNodes() throws Exception { @@ -307,8 +296,8 @@ public class RpcRegistryTest { private void verifyBucket(Bucket bucket, List> expRouteIds) { RoutingTable table = bucket.getData(); Assert.assertNotNull("Bucket RoutingTable is null", table); - for(RouteIdentifier r: expRouteIds) { - if(!table.contains(r)) { + for (RouteIdentifier r : expRouteIds) { + if (!table.contains(r)) { Assert.fail("RoutingTable does not contain " + r + ". Actual: " + table); } } @@ -318,8 +307,8 @@ public class RpcRegistryTest { private Map> retrieveBuckets(ActorRef bucketStore, JavaTestKit testKit, Address... addresses) { - int nTries = 0; - while(true) { + int numTries = 0; + while (true) { bucketStore.tell(new GetAllBuckets(), testKit.getRef()); @SuppressWarnings("unchecked") GetAllBucketsReply reply = testKit.expectMsgClass(Duration.create(3, TimeUnit.SECONDS), @@ -327,19 +316,19 @@ public class RpcRegistryTest { Map> buckets = reply.getBuckets(); boolean foundAll = true; - for(Address addr: addresses) { + for (Address addr : addresses) { Bucket bucket = buckets.get(addr); - if(bucket == null) { + if (bucket == null) { foundAll = false; break; } } - if(foundAll) { + if (foundAll) { return buckets; } - if(++nTries >= 50) { + if (++numTries >= 50) { Assert.fail("Missing expected buckets for addresses: " + Arrays.toString(addresses) + ", Actual: " + buckets); } @@ -356,7 +345,7 @@ public class RpcRegistryTest { final int nRoutes = 500; final RouteIdentifier[] added = new RouteIdentifier[nRoutes]; - for(int i = 0; i < nRoutes; i++) { + for (int i = 0; i < nRoutes; i++) { final RouteIdentifierImpl routeId = new RouteIdentifierImpl(null, new QName(new URI("/mockrpc"), "type" + i), null); added[i] = routeId; @@ -368,23 +357,23 @@ public class RpcRegistryTest { GetAllBuckets getAllBuckets = new GetAllBuckets(); FiniteDuration duration = Duration.create(3, TimeUnit.SECONDS); - int nTries = 0; - while(true) { + int numTries = 0; + while (true) { registry1.tell(getAllBuckets, testKit.getRef()); @SuppressWarnings("unchecked") GetAllBucketsReply reply = testKit.expectMsgClass(duration, GetAllBucketsReply.class); Bucket localBucket = reply.getBuckets().values().iterator().next(); RoutingTable table = localBucket.getData(); - if(table != null && table.size() == nRoutes) { - for(RouteIdentifier r: added) { + if (table != null && table.size() == nRoutes) { + for (RouteIdentifier r : added) { Assert.assertEquals("RoutingTable contains " + r, true, table.contains(r)); } break; } - if(++nTries >= 50) { + if (++numTries >= 50) { Assert.fail("Expected # routes: " + nRoutes + ", Actual: " + table.size()); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java index 2c9a141307..39bcd764cd 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.remote.rpc.registry.gossip; import akka.actor.ActorSystem; import akka.actor.Address; import akka.actor.Props; +import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; import com.typesafe.config.ConfigFactory; import java.util.HashMap; @@ -40,24 +41,22 @@ public class BucketStoreTest { @BeforeClass public static void setup() { - system = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("unit-test")); system.actorOf(Props.create(TerminationMonitor.class), "termination-monitor"); } @AfterClass public static void teardown() { - system.shutdown(); + JavaTestKit.shutdownActorSystem(system); } /** - * Given remote buckets - * Should merge with local copy of remote buckets + * Given remote buckets, should merge with local copy of remote buckets. */ @Test - public void testReceiveUpdateRemoteBuckets(){ + public void testReceiveUpdateRemoteBuckets() { - BucketStore store = createStore(); + final BucketStore store = createStore(); Address localAddress = system.provider().getDefaultAddress(); Bucket localBucket = new BucketImpl<>(); @@ -99,23 +98,23 @@ public class BucketStoreTest { Assert.assertTrue(remoteBucketsInStore.size() == 4); //Update a bucket - Bucket b3_new = new BucketImpl<>(); + Bucket b3New = new BucketImpl<>(); remoteBuckets.clear(); - remoteBuckets.put(a3, b3_new); + remoteBuckets.put(a3, b3New); remoteBuckets.put(a1, null); remoteBuckets.put(a2, null); store.receiveUpdateRemoteBuckets(remoteBuckets); //Should only update a3 remoteBucketsInStore = store.getRemoteBuckets(); - Bucket b3_inStore = remoteBucketsInStore.get(a3); - Assert.assertEquals(b3_new.getVersion(), b3_inStore.getVersion()); + Bucket b3InStore = remoteBucketsInStore.get(a3); + Assert.assertEquals(b3New.getVersion(), b3InStore.getVersion()); //Should NOT update a1 and a2 - Bucket b1_inStore = remoteBucketsInStore.get(a1); - Bucket b2_inStore = remoteBucketsInStore.get(a2); - Assert.assertEquals(b1.getVersion(), b1_inStore.getVersion()); - Assert.assertEquals(b2.getVersion(), b2_inStore.getVersion()); + Bucket b1InStore = remoteBucketsInStore.get(a1); + Bucket b2InStore = remoteBucketsInStore.get(a2); + Assert.assertEquals(b1.getVersion(), b1InStore.getVersion()); + Assert.assertEquals(b2.getVersion(), b2InStore.getVersion()); Assert.assertTrue(remoteBucketsInStore.size() == 4); //Should update versions map @@ -124,7 +123,7 @@ public class BucketStoreTest { Assert.assertEquals(4, versionsInStore.size()); Assert.assertEquals(b1.getVersion(), versionsInStore.get(a1)); Assert.assertEquals(b2.getVersion(), versionsInStore.get(a2)); - Assert.assertEquals(b3_new.getVersion(), versionsInStore.get(a3)); + Assert.assertEquals(b3New.getVersion(), versionsInStore.get(a3)); Assert.assertEquals(b4.getVersion(), versionsInStore.get(a4)); //Send older version of bucket @@ -134,8 +133,8 @@ public class BucketStoreTest { //Should NOT update a3 remoteBucketsInStore = store.getRemoteBuckets(); - b3_inStore = remoteBucketsInStore.get(a3); - Assert.assertTrue(b3_inStore.getVersion().longValue() == b3_new.getVersion().longValue()); + b3InStore = remoteBucketsInStore.get(a3); + Assert.assertTrue(b3InStore.getVersion().longValue() == b3New.getVersion().longValue()); } @@ -144,10 +143,9 @@ public class BucketStoreTest { * * @return instance of BucketStore class */ - private static BucketStore createStore(){ + private static BucketStore createStore() { final Props props = Props.create(BucketStore.class, new RemoteRpcProviderConfig(system.settings().config())); final TestActorRef> testRef = TestActorRef.create(system, props, "testStore"); return testRef.underlyingActor(); } - } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossiperTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossiperTest.java index 54b09bfce7..642534028b 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossiperTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossiperTest.java @@ -15,11 +15,11 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipEnvelope; -import static org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipStatus; + import akka.actor.ActorSystem; import akka.actor.Address; import akka.actor.Props; +import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; import com.typesafe.config.ConfigFactory; import java.util.ArrayList; @@ -33,6 +33,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.remote.rpc.RemoteRpcProviderConfig; import org.opendaylight.controller.remote.rpc.TerminationMonitor; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipEnvelope; +import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.GossiperMessages.GossipStatus; public class GossiperTest { @@ -52,23 +54,22 @@ public class GossiperTest { @AfterClass public static void teardown() { - if (system != null) - system.shutdown(); + JavaTestKit.shutdownActorSystem(system); } @Before - public void createMocks(){ + public void createMocks() { mockGossiper = spy(gossiper); } @After - public void resetMocks(){ + public void resetMocks() { reset(mockGossiper); } @Test - public void testReceiveGossipTick_WhenNoRemoteMemberShouldIgnore(){ + public void testReceiveGossipTick_WhenNoRemoteMemberShouldIgnore() { mockGossiper.setClusterMembers(Collections.
    emptyList()); doNothing().when(mockGossiper).getLocalStatusAndSendTo(any(Address.class)); @@ -77,7 +78,7 @@ public class GossiperTest { } @Test - public void testReceiveGossipTick_WhenRemoteMemberExistsShouldSendStatus(){ + public void testReceiveGossipTick_WhenRemoteMemberExistsShouldSendStatus() { List
    members = new ArrayList<>(); Address remote = new Address("tcp", "member"); members.add(remote); @@ -88,8 +89,9 @@ public class GossiperTest { verify(mockGossiper, times(1)).getLocalStatusAndSendTo(any(Address.class)); } + @SuppressWarnings("unchecked") @Test - public void testReceiveGossipStatus_WhenSenderIsNonMemberShouldIgnore(){ + public void testReceiveGossipStatus_WhenSenderIsNonMemberShouldIgnore() { Address nonMember = new Address("tcp", "non-member"); GossipStatus remoteStatus = new GossipStatus(nonMember, mock(Map.class)); @@ -103,8 +105,9 @@ public class GossiperTest { verify(mockGossiper, times(0)).getSender(); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testReceiveGossip_WhenNotAddressedToSelfShouldIgnore(){ + public void testReceiveGossipWhenNotAddressedToSelfShouldIgnore() { Address notSelf = new Address("tcp", "not-self"); GossipEnvelope envelope = new GossipEnvelope(notSelf, notSelf, mock(Map.class)); @@ -118,11 +121,11 @@ public class GossiperTest { * * @return instance of Gossiper class */ - private static Gossiper createGossiper(){ - - final Props props = Props.create(Gossiper.class, false, new RemoteRpcProviderConfig(system.settings().config())); + private static Gossiper createGossiper() { + final Props props = Props.create(Gossiper.class, false, + new RemoteRpcProviderConfig(system.settings().config())); final TestActorRef testRef = TestActorRef.create(system, props, "testGossiper"); return testRef.underlyingActor(); } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java index a618bff6a3..0b94b546eb 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java @@ -9,47 +9,46 @@ package org.opendaylight.controller.remote.rpc.utils; import static org.junit.Assert.assertTrue; + import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.japi.Pair; import akka.testkit.JavaTestKit; import akka.testkit.TestProbe; import com.typesafe.config.ConfigFactory; +import java.util.ArrayList; +import java.util.List; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - public class LatestEntryRoutingLogicTest { - - static ActorSystem system; - - @BeforeClass - public static void setup() throws InterruptedException { - system = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("odl-cluster-rpc")); - } - - @AfterClass - public static void teardown() { - JavaTestKit.shutdownActorSystem(system); - system = null; - } - - @Test - public void testRoutingLogic() { - List> pairList = new ArrayList<>(); - TestProbe probe1 = new TestProbe(system); - TestProbe probe2 = new TestProbe(system); - TestProbe probe3 = new TestProbe(system); - ActorRef actor1 = probe1.ref(); - ActorRef actor2 = probe2.ref(); - ActorRef actor3 = probe3.ref(); - pairList.add(new Pair<>(actor1, 1000L)); - pairList.add(new Pair<>(actor2, 3000L)); - pairList.add(new Pair<>(actor3, 2000L)); - RoutingLogic logic = new LatestEntryRoutingLogic(pairList); - assertTrue(logic.select().equals(actor2)); - } + static ActorSystem system; + + @BeforeClass + public static void setup() throws InterruptedException { + system = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("odl-cluster-rpc")); + } + + @AfterClass + public static void teardown() { + JavaTestKit.shutdownActorSystem(system); + system = null; + } + + @Test + public void testRoutingLogic() { + List> pairList = new ArrayList<>(); + TestProbe probe1 = new TestProbe(system); + TestProbe probe2 = new TestProbe(system); + TestProbe probe3 = new TestProbe(system); + ActorRef actor1 = probe1.ref(); + ActorRef actor2 = probe2.ref(); + ActorRef actor3 = probe3.ref(); + pairList.add(new Pair<>(actor1, 1000L)); + pairList.add(new Pair<>(actor2, 3000L)); + pairList.add(new Pair<>(actor3, 2000L)); + RoutingLogic logic = new LatestEntryRoutingLogic(pairList); + assertTrue(logic.select().equals(actor2)); + } } -- 2.36.6