Clean up sal-remoterpc-connector

[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..535d5c7cd68d58928c14e439eb6ca889f8aa1c22 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
@@ -7,28 +7,27 @@
  */
 package org.opendaylight.controller.remote.rpc.registry.gossip;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
 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;
 
-    BucketImpl(final Long version, final T data) {
-        this.version = Preconditions.checkNotNull(version);
-        this.data = Preconditions.checkNotNull(data);
+    BucketImpl(final long version, final T data) {
+        this.version = version;
+        this.data = requireNonNull(data);
     }
 
     @Override
     public long getVersion() {
-        return version.longValue();
+        return version;
     }
 
     @Override
@@ -42,8 +41,7 @@ final class BucketImpl<T extends BucketData<T>> implements Bucket<T>, Serializab
     }
 
     private Object readResolve() {
-        Verify.verifyNotNull(version);
-        Verify.verifyNotNull(data);
+        verifyNotNull(data);
         return this;
     }
 }