Upgrade Alleycat dependency to 0.4.

atomix · Jul 10, 2015 · 841b32e · 841b32e
1 parent 9285832
commit 841b32e
Show file tree

Hide file tree

Showing 42 changed files with 211 additions and 158 deletions.
diff --git a/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java b/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java
@@ -18,7 +18,8 @@
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
 import net.kuujo.alleycat.SerializeWith;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
@@ -399,13 +400,13 @@ public long ttl() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       buffer.writeByte(mode.ordinal())
         .writeLong(ttl);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       mode = Mode.values()[buffer.readByte()];
       ttl = buffer.readLong();
     }
@@ -468,12 +469,12 @@ public ConsistencyLevel consistency() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       buffer.writeByte(consistency.ordinal());
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       consistency = ConsistencyLevel.values()[buffer.readByte()];
     }
 
@@ -552,12 +553,12 @@ public Object value() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       alleycat.writeObject(value, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       value = alleycat.readObject(buffer);
     }
 
@@ -625,13 +626,13 @@ public Object update() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       alleycat.writeObject(expect, buffer);
       alleycat.writeObject(update, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       expect = alleycat.readObject(buffer);
       update = alleycat.readObject(buffer);
     }
@@ -702,12 +703,12 @@ public Object value() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       alleycat.writeObject(value, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       value = alleycat.readObject(buffer);
     }
 

diff --git a/cluster/pom.xml b/cluster/pom.xml
@@ -26,18 +26,6 @@
   <artifactId>copycat-cluster</artifactId>
   <name>Copycat Cluster</name>
 
-  <properties>
-    <alleycat.version>0.3</alleycat.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>net.kuujo.alleycat</groupId>
-      <artifactId>alleycat</artifactId>
-      <version>${alleycat.version}</version>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <!-- This plugin forces the generation of jar containing streaming test classes, so that the tests 

diff --git a/cluster/src/main/java/net/kuujo/copycat/cluster/MemberInfo.java b/cluster/src/main/java/net/kuujo/copycat/cluster/MemberInfo.java
@@ -17,7 +17,8 @@
 
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 
 /**
  * Member info.
@@ -44,12 +45,12 @@ public int id() {
   }
 
   @Override
-  public void writeObject(Buffer buffer, Alleycat alleycat) {
+  public void writeObject(BufferOutput buffer, Alleycat alleycat) {
     buffer.writeInt(id);
   }
 
   @Override
-  public void readObject(Buffer buffer, Alleycat alleycat) {
+  public void readObject(BufferInput buffer, Alleycat alleycat) {
     id = buffer.readInt();
   }
 

diff --git a/collections/src/main/java/net/kuujo/copycat/collections/AsyncMap.java b/collections/src/main/java/net/kuujo/copycat/collections/AsyncMap.java
@@ -18,7 +18,8 @@
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
 import net.kuujo.alleycat.SerializeWith;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
@@ -442,12 +443,12 @@ public ConsistencyLevel consistency() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       buffer.writeByte(consistency.ordinal());
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       consistency = ConsistencyLevel.values()[buffer.readByte()];
     }
 
@@ -487,12 +488,12 @@ public Object key() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       alleycat.writeObject(key, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       key = alleycat.readObject(buffer);
     }
 
@@ -529,13 +530,13 @@ public Object key() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       alleycat.writeObject(key, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       key = alleycat.readObject(buffer);
     }
@@ -597,13 +598,13 @@ public Object value() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       alleycat.writeObject(value, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       value = alleycat.readObject(buffer);
     }
@@ -653,13 +654,13 @@ public long ttl() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       buffer.writeByte(mode.ordinal()).writeLong(ttl);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       mode = Mode.values()[buffer.readByte()];
       ttl = buffer.readLong();
@@ -803,13 +804,13 @@ public Object defaultValue() {
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       defaultValue = alleycat.readObject(buffer);
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       alleycat.writeObject(defaultValue, buffer);
     }
@@ -922,12 +923,12 @@ public static Builder builder() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
 
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
 
     }
 

diff --git a/collections/src/main/java/net/kuujo/copycat/collections/AsyncSet.java b/collections/src/main/java/net/kuujo/copycat/collections/AsyncSet.java
@@ -18,7 +18,8 @@
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
 import net.kuujo.alleycat.SerializeWith;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
@@ -232,12 +233,12 @@ public ConsistencyLevel consistency() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       buffer.writeByte(consistency.ordinal());
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       consistency = ConsistencyLevel.values()[buffer.readByte()];
     }
 
@@ -274,12 +275,12 @@ public int value() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       alleycat.writeObject(value, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       value = alleycat.readObject(buffer);
     }
 
@@ -316,13 +317,13 @@ public int value() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       alleycat.writeObject(value, buffer);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       value = alleycat.readObject(buffer);
     }
@@ -396,13 +397,13 @@ public Mode mode() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
       super.writeObject(buffer, alleycat);
       buffer.writeByte(mode.ordinal()).writeLong(ttl);
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
       super.readObject(buffer, alleycat);
       mode = Mode.values()[buffer.readByte()];
       ttl = buffer.readLong();
@@ -559,12 +560,12 @@ public static Builder builder() {
     }
 
     @Override
-    public void writeObject(Buffer buffer, Alleycat alleycat) {
+    public void writeObject(BufferOutput buffer, Alleycat alleycat) {
 
     }
 
     @Override
-    public void readObject(Buffer buffer, Alleycat alleycat) {
+    public void readObject(BufferInput buffer, Alleycat alleycat) {
 
     }
 

diff --git a/core/src/main/java/net/kuujo/copycat/Event.java b/core/src/main/java/net/kuujo/copycat/Event.java
@@ -18,7 +18,8 @@
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
 import net.kuujo.alleycat.SerializeWith;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 
 /**
  * Copycat event.
@@ -58,12 +59,12 @@ public String path() {
   }
 
   @Override
-  public void writeObject(Buffer buffer, Alleycat alleycat) {
+  public void writeObject(BufferOutput buffer, Alleycat alleycat) {
     buffer.writeByte(type.ordinal()).writeUTF8(path);
   }
 
   @Override
-  public void readObject(Buffer buffer, Alleycat alleycat) {
+  public void readObject(BufferInput buffer, Alleycat alleycat) {
     type = Type.values()[buffer.readByte()];
     path = buffer.readUTF8();
   }

diff --git a/core/src/main/java/net/kuujo/copycat/ResourceOperation.java b/core/src/main/java/net/kuujo/copycat/ResourceOperation.java
@@ -17,7 +17,8 @@
 
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.alleycat.AlleycatSerializable;
-import net.kuujo.alleycat.io.Buffer;
+import net.kuujo.alleycat.io.BufferInput;
+import net.kuujo.alleycat.io.BufferOutput;
 import net.kuujo.copycat.raft.Operation;
 
 /**
@@ -48,13 +49,13 @@ public T operation() {
   }
 
   @Override
-  public void writeObject(Buffer buffer, Alleycat alleycat) {
+  public void writeObject(BufferOutput buffer, Alleycat alleycat) {
     buffer.writeLong(resource);
     alleycat.writeObject(operation, buffer);
   }
 
   @Override
-  public void readObject(Buffer buffer, Alleycat alleycat) {
+  public void readObject(BufferInput buffer, Alleycat alleycat) {
     resource = buffer.readLong();
     operation = alleycat.readObject(buffer);
   }