X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FRequestFailure.java;h=db5a15b0bc57c5cda03bfd05ffaed53db7550024;hb=977d978c63f1097827044c3b0ee0babc36a540ed;hp=7fd9009517289a091d2655a70e4cbd5757f2597c;hpb=e4959b48fbe437645fff11374ff7fe3fd200932e;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestFailure.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestFailure.java
index 7fd9009517..db5a15b0bc 100644
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestFailure.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestFailure.java
@@ -7,10 +7,11 @@
  */
 package org.opendaylight.controller.cluster.access.concepts;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;
 
@@ -23,19 +24,20 @@ import org.opendaylight.yangtools.concepts.WritableIdentifier;
  * @param <C> Message class
  */
 @Beta
-public abstract class RequestFailure<T extends WritableIdentifier, C extends RequestFailure<T, C>> extends Response<T, C> {
+public abstract class RequestFailure<T extends WritableIdentifier, C extends RequestFailure<T, C>>
+        extends Response<T, C> {
     private static final long serialVersionUID = 1L;
-    private final RequestException cause;
 
-    protected RequestFailure(final @Nonnull C failure, final @Nonnull ABIVersion version) {
+    private final @NonNull RequestException cause;
+
+    protected RequestFailure(final @NonNull C failure, final @NonNull ABIVersion version) {
         super(failure, version);
-        this.cause = Preconditions.checkNotNull(failure.getCause());
+        this.cause = requireNonNull(failure.getCause());
     }
 
-    protected RequestFailure(final @Nonnull T target, final long sequence, final long retry,
-            final @Nonnull RequestException cause) {
-        super(target, sequence, retry);
-        this.cause = Preconditions.checkNotNull(cause);
+    protected RequestFailure(final @NonNull T target, final long sequence, final @NonNull RequestException cause) {
+        super(target, sequence);
+        this.cause = requireNonNull(cause);
     }
 
     /**
@@ -43,7 +45,7 @@ public abstract class RequestFailure<T extends WritableIdentifier, C extends Req
      *
      * @return Failure cause.
      */
-    public final @Nonnull RequestException getCause() {
+    public final @NonNull RequestException getCause() {
         return cause;
     }
 
@@ -63,5 +65,5 @@ public abstract class RequestFailure<T extends WritableIdentifier, C extends Req
     }
 
     @Override
-    protected abstract AbstractRequestFailureProxy<T, C> externalizableProxy(@Nonnull ABIVersion version);
+    protected abstract AbstractRequestFailureProxy<T, C> externalizableProxy(ABIVersion version);
 }