BUG-7594: Rework sal-remoterpc-connector messages

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / registry / gossip / BucketImpl.java

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 ade614b8d765ed23205d0565bbf0b428db484897..daf945289c42b65b6adc1d0c8d31529749a378b5 100644 (file)
--- 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
@@ -12,23 +12,21 @@ import com.google.common.base.Verify;
 import java.io.Serializable;
 
 final class BucketImpl<T extends BucketData<T>> implements Bucket<T>, Serializable {
 import java.io.Serializable;
 
 final class BucketImpl<T extends BucketData<T>> implements Bucket<T>, Serializable {

-    private static final long serialVersionUID = 294779770032719196L;
+    private static final long serialVersionUID = 1L;

 
 

-    // Guaranteed to be non-null.
-    // This is kept a Long for binary compatibility of serialization format.
-    private final Long version;
+    private final long version;

 
     // Guaranteed to be non-null
     private final T data;
 
 
     // Guaranteed to be non-null
     private final T data;
 

-    BucketImpl(final Long version, final T data) {
-        this.version = Preconditions.checkNotNull(version);
+    BucketImpl(final long version, final T data) {
+        this.version = version;

         this.data = Preconditions.checkNotNull(data);
     }
 
     @Override
     public long getVersion() {
         this.data = Preconditions.checkNotNull(data);
     }
 
     @Override
     public long getVersion() {

-        return version.longValue();
+        return version;

     }
 
     @Override
     }
 
     @Override


@@ -42,7 +40,6 @@ final class BucketImpl<T extends BucketData<T>> implements Bucket<T>, Serializab
     }
 
     private Object readResolve() {
     }
 
     private Object readResolve() {

-        Verify.verifyNotNull(version);

         Verify.verifyNotNull(data);
         return this;
     }
         Verify.verifyNotNull(data);
         return this;
     }