Replace ClientRequest/ClientResponse with SessionRequest/SessionRespo…

…nse.

protocol/src/main/java/net/kuujo/copycat/raft/protocol/CommandResponse.java

@@ -31,7 +31,7 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @SerializeWith(id=259)
-public class CommandResponse extends ClientResponse<CommandResponse> {
+public class CommandResponse extends SessionResponse<CommandResponse> {
   private static final BuilderPool<Builder, CommandResponse> POOL = new BuilderPool<>(Builder::new);
 
   /**
@@ -118,7 +118,7 @@ public String toString() {
   /**
    * Command response builder.
    */
-  public static class Builder extends ClientResponse.Builder<Builder, CommandResponse> {
+  public static class Builder extends SessionResponse.Builder<Builder, CommandResponse> {
 
     protected Builder(BuilderPool<Builder, CommandResponse> pool) {
       super(pool, CommandResponse::new);

protocol/src/main/java/net/kuujo/copycat/raft/protocol/KeepAliveResponse.java

@@ -32,7 +32,7 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @SerializeWith(id=263)
-public class KeepAliveResponse extends ClientResponse<KeepAliveResponse> {
+public class KeepAliveResponse extends SessionResponse<KeepAliveResponse> {
   private static final BuilderPool<Builder, KeepAliveResponse> POOL = new BuilderPool<>(Builder::new);
 
   /**
@@ -142,7 +142,7 @@ public String toString() {
   /**
    * Status response builder.
    */
-  public static class Builder extends ClientResponse.Builder<Builder, KeepAliveResponse> {
+  public static class Builder extends SessionResponse.Builder<Builder, KeepAliveResponse> {
 
     protected Builder(BuilderPool<Builder, KeepAliveResponse> pool) {
       super(pool, KeepAliveResponse::new);

protocol/src/main/java/net/kuujo/copycat/raft/protocol/PublishResponse.java

@@ -15,12 +15,12 @@
  */
 package net.kuujo.copycat.raft.protocol;
 
-import net.kuujo.copycat.util.BuilderPool;
-import net.kuujo.copycat.raft.RaftError;
 import net.kuujo.copycat.io.BufferInput;
 import net.kuujo.copycat.io.BufferOutput;
 import net.kuujo.copycat.io.serializer.SerializeWith;
 import net.kuujo.copycat.io.serializer.Serializer;
+import net.kuujo.copycat.raft.RaftError;
+import net.kuujo.copycat.util.BuilderPool;
 import net.kuujo.copycat.util.ReferenceManager;
 
 import java.util.Objects;
@@ -31,7 +31,7 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @SerializeWith(id=269)
-public class PublishResponse extends AbstractResponse<PublishResponse> {
+public class PublishResponse extends SessionResponse<PublishResponse> {
   private static final BuilderPool<Builder, PublishResponse> POOL = new BuilderPool<>(Builder::new);
 
   /**
@@ -102,7 +102,7 @@ public String toString() {
   /**
    * Publish response builder.
    */
-  public static class Builder extends AbstractResponse.Builder<Builder, PublishResponse> {
+  public static class Builder extends SessionResponse.Builder<Builder, PublishResponse> {
 
     protected Builder(BuilderPool<Builder, PublishResponse> pool) {
       super(pool, PublishResponse::new);

protocol/src/main/java/net/kuujo/copycat/raft/protocol/QueryResponse.java

@@ -31,7 +31,7 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @SerializeWith(id=271)
-public class QueryResponse extends ClientResponse<QueryResponse> {
+public class QueryResponse extends SessionResponse<QueryResponse> {
   private static final BuilderPool<Builder, QueryResponse> POOL = new BuilderPool<>(Builder::new);
 
   /**
@@ -118,7 +118,7 @@ public String toString() {
   /**
    * Query response builder.
    */
-  public static class Builder extends ClientResponse.Builder<Builder, QueryResponse> {
+  public static class Builder extends SessionResponse.Builder<Builder, QueryResponse> {
 
     protected Builder(BuilderPool<Builder, QueryResponse> pool) {
       super(pool, QueryResponse::new);

protocol/src/main/java/net/kuujo/copycat/raft/protocol/SessionRequest.java

@@ -15,10 +15,10 @@
  */
 package net.kuujo.copycat.raft.protocol;
 
-import net.kuujo.copycat.util.BuilderPool;
 import net.kuujo.copycat.io.BufferInput;
 import net.kuujo.copycat.io.BufferOutput;
 import net.kuujo.copycat.io.serializer.Serializer;
+import net.kuujo.copycat.util.BuilderPool;
 import net.kuujo.copycat.util.ReferenceFactory;
 import net.kuujo.copycat.util.ReferenceManager;
 
@@ -27,8 +27,9 @@
  *
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
-public abstract class SessionRequest<T extends SessionRequest<T>> extends ClientRequest<T> {
+public abstract class SessionRequest<T extends SessionRequest<T>> extends AbstractRequest<T> {
   protected long session;
+  protected long version;
 
   public SessionRequest(ReferenceManager<T> referenceManager) {
     super(referenceManager);
@@ -43,22 +44,31 @@ public long session() {
     return session;
   }
 
+  /**
+   * Returns the response version.
+   *
+   * @return The response version.
+   */
+  public long version() {
+    return version;
+  }
+
   @Override
   public void readObject(BufferInput buffer, Serializer serializer) {
-    super.readObject(buffer, serializer);
     session = buffer.readLong();
+    version = buffer.readLong();
   }
 
   @Override
   public void writeObject(BufferOutput buffer, Serializer serializer) {
-    super.writeObject(buffer, serializer);
     buffer.writeLong(session);
+    buffer.writeLong(version);
   }
 
   /**
    * Client request builder.
    */
-  public static abstract class Builder<T extends Builder<T, U>, U extends SessionRequest<U>> extends ClientRequest.Builder<T, U> {
+  public static abstract class Builder<T extends Builder<T, U>, U extends SessionRequest<U>> extends AbstractRequest.Builder<T, U> {
 
     protected Builder(BuilderPool<T, U> pool, ReferenceFactory<U> factory) {
       super(pool, factory);
@@ -68,6 +78,7 @@ protected Builder(BuilderPool<T, U> pool, ReferenceFactory<U> factory) {
     protected void reset() {
       super.reset();
       request.session = 0;
+      request.version = 0;
     }
 
     /**
@@ -83,6 +94,20 @@ public T withSession(long session) {
       request.session = session;
       return (T) this;
     }
+
+    /**
+     * Sets the request version.
+     *
+     * @param version The request version.
+     * @return The request builder.
+     */
+    @SuppressWarnings("unchecked")
+    public T withVersion(long version) {
+      if (version < 0)
+        throw new IllegalArgumentException("version must be positive");
+      request.version = version;
+      return (T) this;
+    }
   }
 
 }

protocol/src/main/java/net/kuujo/copycat/raft/protocol/ClientResponse.java → protocol/src/main/java/net/kuujo/copycat/raft/protocol/SessionResponse.java

@@ -20,20 +20,20 @@
 import net.kuujo.copycat.util.ReferenceManager;
 
 /**
- * Client response.
+ * Session response.
  *
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
-public abstract class ClientResponse<T extends ClientResponse<T>> extends AbstractResponse<T> {
+public abstract class SessionResponse<T extends SessionResponse<T>> extends AbstractResponse<T> {
 
-  public ClientResponse(ReferenceManager<T> referenceManager) {
+  public SessionResponse(ReferenceManager<T> referenceManager) {
     super(referenceManager);
   }
 
   /**
-   * Client response builder.
+   * Session response builder.
    */
-  public static abstract class Builder<T extends Builder<T, U>, U extends ClientResponse<U>> extends AbstractResponse.Builder<T, U> {
+  public static abstract class Builder<T extends Builder<T, U>, U extends SessionResponse<U>> extends AbstractResponse.Builder<T, U> {
     protected Builder(BuilderPool<T, U> pool, ReferenceFactory<U> factory) {
       super(pool, factory);
     }