Bump upstream SNAPSHOTS

[controller.git] / opendaylight / md-sal / cds-access-api / src / main / java / org / opendaylight / controller / cluster / access / commands / ConnectClientRequest.java

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java
index 4800cea5e2a292db468103c1585ad7353185e2e2..ba86035e920a2356424bbdc37050d0eb2771907c 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.controller.cluster.access.commands;
 
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.ActorRef;
 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.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
@@ -24,6 +24,7 @@ import org.opendaylight.controller.cluster.access.concepts.RequestException;
  * - its minimum supported ABI version
  * - its maximum supported ABI version
  *
+ * <p>
  * It also includes request stream sequencing information.
  *
  * @author Robert Varga
@@ -34,26 +35,23 @@ public final class ConnectClientRequest extends Request<ClientIdentifier, Connec
 
     private final ABIVersion minVersion;
     private final ABIVersion maxVersion;
-    private final long resumeSequence;
 
-    public ConnectClientRequest(final ClientIdentifier identifier, final ActorRef replyTo, final ABIVersion minVersion,
-            final ABIVersion maxVersion) {
-        this(identifier, replyTo, minVersion, maxVersion, 0);
+    ConnectClientRequest(final ClientIdentifier identifier, final long txSequence, final ActorRef replyTo,
+            final ABIVersion minVersion, final ABIVersion maxVersion) {
+        super(identifier, txSequence, replyTo);
+        this.minVersion = requireNonNull(minVersion);
+        this.maxVersion = requireNonNull(maxVersion);
     }
 
     public ConnectClientRequest(final ClientIdentifier identifier, final ActorRef replyTo, final ABIVersion minVersion,
-            final ABIVersion maxVersion, final long resumeSequence) {
-        super(identifier, replyTo);
-        this.minVersion = Preconditions.checkNotNull(minVersion);
-        this.maxVersion = Preconditions.checkNotNull(maxVersion);
-        this.resumeSequence = resumeSequence;
+            final ABIVersion maxVersion) {
+        this(identifier, 0, replyTo, minVersion, maxVersion);
     }
 
     private ConnectClientRequest(final ConnectClientRequest request, final ABIVersion version) {
         super(request, version);
         this.minVersion = request.minVersion;
         this.maxVersion = request.maxVersion;
-        this.resumeSequence = request.resumeSequence;
     }
 
     public ABIVersion getMinVersion() {
@@ -64,17 +62,14 @@ public final class ConnectClientRequest extends Request<ClientIdentifier, Connec
         return maxVersion;
     }
 
-    public long getResumeSequence() {
-        return resumeSequence;
-    }
-
     @Override
-    public final ConnectClientFailure toRequestFailure(final RequestException cause) {
-        return new ConnectClientFailure(getTarget(), cause);
+    public ConnectClientFailure toRequestFailure(final RequestException cause) {
+        return new ConnectClientFailure(getTarget(), getSequence(), cause);
     }
 
     @Override
-    protected AbstractRequestProxy<ClientIdentifier, ConnectClientRequest> externalizableProxy(final ABIVersion version) {
+    protected AbstractRequestProxy<ClientIdentifier, ConnectClientRequest> externalizableProxy(
+            final ABIVersion version) {
         return new ConnectClientRequestProxyV1(this);
     }
 
@@ -84,8 +79,7 @@ public final class ConnectClientRequest extends Request<ClientIdentifier, Connec
     }
 
     @Override
-    protected @Nonnull ToStringHelper addToStringAttributes(final @Nonnull ToStringHelper toStringHelper) {
-        return super.addToStringAttributes(toStringHelper).add("minVersion", minVersion).add("maxVersion", maxVersion)
-                .add("resumeSequence", resumeSequence);
+    protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
+        return super.addToStringAttributes(toStringHelper).add("minVersion", minVersion).add("maxVersion", maxVersion);
     }
 }