X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2Fgossip%2FMessages.java;h=cc64ba450932750dcf1a78cd16b6e912976d15bf;hb=2418a6052d7eba917d5972f0630cf746d22f690c;hp=4f18584399efc8c656ef09499949ee0ce9433bce;hpb=4258ff0d490fc27658ab53dd71bf96c7aa981b13;p=controller.git 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 4f18584399..cc64ba4509 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 @@ -9,16 +9,14 @@ package org.opendaylight.controller.remote.rpc.registry.gossip; import akka.actor.Address; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.ContainsBucketVersions; import org.opendaylight.controller.remote.rpc.registry.gossip.Messages.BucketStoreMessages.ContainsBuckets; - /** * These messages are used by {@link org.opendaylight.controller.remote.rpc.registry.gossip.BucketStore} and * {@link org.opendaylight.controller.remote.rpc.registry.gossip.Gossiper} actors. @@ -27,21 +25,21 @@ public class Messages { public static class BucketStoreMessages { - public static class GetAllBuckets implements Serializable { + public static final class GetAllBuckets implements Serializable { private static final long serialVersionUID = 1L; } - public static class GetBucketsByMembers implements Serializable { + public static final class GetBucketsByMembers implements Serializable { private static final long serialVersionUID = 1L; private final Set
members; - public GetBucketsByMembers(Set members) { + public GetBucketsByMembers(final Set members) { Preconditions.checkArgument(members != null, "members can not be null"); - this.members = members; + this.members = ImmutableSet.copyOf(members); } public Set getMembers() { - return new HashSet<>(members); + return members; } } @@ -50,42 +48,33 @@ public class Messages { private final Map> buckets; - public ContainsBuckets(Map> buckets) { + protected ContainsBuckets(final Map> buckets) { Preconditions.checkArgument(buckets != null, "buckets can not be null"); - this.buckets = buckets; + this.buckets = ImmutableMap.copyOf(buckets); } - public Map> getBuckets() { - Map> copy = new HashMap<>(buckets.size()); - - for (Map.Entry> entry : buckets.entrySet()) { - //ignore null entries - if ( entry.getKey() == null || entry.getValue() == null ) { - continue; - } - copy.put(entry.getKey(), entry.getValue()); - } - return copy; + public final Map> getBuckets() { + return buckets; } } - public static class GetAllBucketsReply