Kryo doesn't work since bump up a newer version

coderplay · Jul 16, 2015 · ed98c8d · ed98c8d
1 parent 9d88d76
commit ed98c8d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 40 deletions.
diff --git a/...benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/RequestObjectSerializer.java b/...benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/RequestObjectSerializer.java
@@ -4,35 +4,23 @@
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
+import com.esotericsoftware.kryo.serializers.DefaultArraySerializers;
 
 /**
  * RequestObject Serializer
  * 
  */
 public class RequestObjectSerializer extends Serializer<RequestObject> {
-	/**
-	 * @param kryo
-	 * @param output
-	 * @param reqObject
-	 */
-	@Override
-	public void write(Kryo kryo, Output output, RequestObject reqObject) {
-		byte[] content = reqObject.getBytes();
-		output.write(content);
-	}
+  private DefaultArraySerializers.ByteArraySerializer delegate = new DefaultArraySerializers.ByteArraySerializer();
 
-	/**
-	 * @param kryo
-	 * @param input
-	 * @param type
-	 * @return
-	 */
-	public RequestObject create(Kryo kryo, Input input, Class<RequestObject> type) {
-		return new RequestObject(input.getBuffer().length - 1);
-	}
+  @Override
+  public void write(Kryo kryo, Output output, RequestObject reqObject) {
+    delegate.write(kryo, output, reqObject.getBytes());
+  }
 
   @Override
   public RequestObject read(Kryo kryo, Input input, Class<RequestObject> type) {
-    return kryo.readObjectOrNull(input, type);
+    byte[] bytes = delegate.read(kryo, input, byte[].class);
+    return new RequestObject(bytes);
   }
 }
diff --git a/...tningrpc-benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/ResponseObject.java b/...tningrpc-benchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/ResponseObject.java
@@ -15,6 +15,9 @@ public ResponseObject(int size){
 		bytes = new byte[size];
 	}
 
+  public ResponseObject(byte[] bytes){
+    this.bytes = bytes;
+  }
 	public byte[] getBytes() {
 		return bytes;
 	}

diff --git a/...enchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/ResponseObjectSerializer.java b/...enchmark/src/main/java/info/minzhou/lightning/rpc/benchmark/ResponseObjectSerializer.java
@@ -4,36 +4,25 @@
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
+import com.esotericsoftware.kryo.serializers.DefaultArraySerializers;
 
 /**
  * ResponseObject Serializer
  * 
  */
 public class ResponseObjectSerializer extends Serializer<ResponseObject> {
-	/**
-	 * @param kryo
-	 * @param output
-	 * @param resObject
-	 */
-	@Override
-	public void write(Kryo kryo, Output output, ResponseObject resObject) {
-		byte[] content = resObject.getBytes();
-		output.write(content);
-	}
 
-	/**
-	 * @param kryo
-	 * @param input
-	 * @param type
-	 * @return
-	 */
-	public ResponseObject create(Kryo kryo, Input input, Class<ResponseObject> type) {
-		return new ResponseObject(input.getBuffer().length - 1);
+  private DefaultArraySerializers.ByteArraySerializer delegate = new DefaultArraySerializers.ByteArraySerializer();
+
+  @Override
+	public void write(Kryo kryo, Output output, ResponseObject resObject) {
+    delegate.write(kryo, output, resObject.getBytes());
 	}
 
   @Override
   public ResponseObject read(Kryo kryo, Input input,
       Class<ResponseObject> type) {
-    return kryo.readObjectOrNull(input, type);
+    byte[] bytes = delegate.read(kryo, input, byte[].class);
+    return new ResponseObject(bytes);
   }
 }
diff --git a/lightningrpc-common/src/main/java/info/minzhou/lightning/rpc/protocol/KryoEncoder.java b/lightningrpc-common/src/main/java/info/minzhou/lightning/rpc/protocol/KryoEncoder.java
@@ -14,7 +14,7 @@ public class KryoEncoder implements Encoder {
 	 */
 	@Override
 	public byte[] encode(Object object) throws Exception {
-		Output output = new Output(256);
+		Output output = new Output(256, Integer.MAX_VALUE);
 		KryoUtils.getKryo().writeClassAndObject(output, object);
 		return output.toBytes();
 	}