Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 4151 : Create a shared actor system
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
registry
/
gossip
/
BucketStore.java
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 628deb4311cebe1da5ff1b44deb715d933b8b8b2..d349035b3c62f40743ca7fd8da898d39b6bce147 100644
(file)
--- 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
@@
-13,7
+13,7
@@
import akka.actor.ActorRefProvider;
import akka.actor.Address;
import akka.actor.Props;
import akka.cluster.ClusterActorRefProvider;
import akka.actor.Address;
import akka.actor.Props;
import akka.cluster.ClusterActorRefProvider;
-import com.google.common.
annotations.VisibleForTesting
;
+import com.google.common.
base.Preconditions
;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@
-69,8
+69,8
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
private final RemoteRpcProviderConfig config;
private final RemoteRpcProviderConfig config;
- public BucketStore(){
-
config = new RemoteRpcProviderConfig(getContext().system().settings().config()
);
+ public BucketStore(
RemoteRpcProviderConfig config
){
+
this.config = Preconditions.checkNotNull(config
);
}
@Override
}
@Override
@@
-79,7
+79,7
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
selfAddress = provider.getDefaultAddress();
if ( provider instanceof ClusterActorRefProvider) {
selfAddress = provider.getDefaultAddress();
if ( provider instanceof ClusterActorRefProvider) {
- getContext().actorOf(Props.create(Gossiper.class).withMailbox(config.getMailBoxName()), "gossiper");
+ getContext().actorOf(Props.create(Gossiper.class
, config
).withMailbox(config.getMailBoxName()), "gossiper");
}
}
}
}
@@
-230,7
+230,7
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
}
}
}
}
- p
rotected
BucketImpl<T> getLocalBucket() {
+ p
ublic
BucketImpl<T> getLocalBucket() {
return localBucket;
}
return localBucket;
}
@@
-239,12
+239,11
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
versions.put(selfAddress, localBucket.getVersion());
}
versions.put(selfAddress, localBucket.getVersion());
}
- p
rotected
Map<Address, Bucket<T>> getRemoteBuckets() {
+ p
ublic
Map<Address, Bucket<T>> getRemoteBuckets() {
return remoteBuckets;
}
return remoteBuckets;
}
- @VisibleForTesting
- Map<Address, Long> getVersions() {
+ public Map<Address, Long> getVersions() {
return versions;
}
}
return versions;
}
}