X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2Fgossip%2FMessages.java;h=99a94e70e9114bc2f6e320240bf75d150034c84a;hp=b05bd7d0f6f314c990e4a1d7909115b6c1ad1348;hb=9ddc65e1ddae50f691566cd9382707679436c055;hpb=488cc48063a540a046084b398c72e5c58d2c7288
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 b05bd7d0f6..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,21 +45,22 @@ public class Messages {
}
}
- public static class ContainsBuckets implements Serializable{
- private static final long serialVersionUID = 1L;
- private final Map buckets;
+ 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;
}
- public Map getBuckets() {
- Map copy = new HashMap<>(buckets.size());
+ 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());
@@ -68,16 +69,19 @@ 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) {
+
+ 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) {
+
+ public GetBucketsByMembersReply(Map> buckets) {
super(buckets);
}
}
@@ -86,8 +90,9 @@ public class Messages {
private static final long serialVersionUID = 1L;
}
- public static class ContainsBucketVersions implements Serializable{
- private static final long serialVersionUID = 1L;
+ public static class ContainsBucketVersions implements Serializable {
+ private static final long serialVersionUID = -8172148925383801613L;
+
Map versions;
public ContainsBucketVersions(Map versions) {
@@ -102,32 +107,36 @@ 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) {
+
+ 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 = 1L;
+ private static final long serialVersionUID = -4770935099506366773L;
}
public static final class GossipTick extends Tick {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5803354404380026143L;
}
- public static final class GossipStatus extends ContainsBucketVersions implements Serializable{
- private static final long serialVersionUID = 1L;
+ public static final class GossipStatus extends ContainsBucketVersions implements Serializable {
+ private static final long serialVersionUID = -593037395143883265L;
+
private final Address from;
public GossipStatus(Address from, Map versions) {
@@ -140,12 +149,14 @@ public class Messages {
}
}
- public static final class GossipEnvelope extends ContainsBuckets implements Serializable {
- private static final long serialVersionUID = 1L;
+ public static final class GossipEnvelope> extends ContainsBuckets
+ implements Serializable {
+ private static final long serialVersionUID = 8346634072582438818L;
+
private final Address from;
private final Address to;
- public GossipEnvelope(Address from, Address to, Map buckets) {
+ public GossipEnvelope(Address from, Address to, Map> buckets) {
super(buckets);
Preconditions.checkArgument(to != null, "Recipient of message must not be null");
this.to = to;