This is an automated email from the ASF dual-hosted git repository.
jorgebg pushed a commit to branch TINKERPOP-2161
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/TINKERPOP-2161 by this push:
new 70637df Remove unused param from ResponseMessageSerializer and
CHANGELOG entry
70637df is described below
commit 70637dfb86836d28eeb162ef89fd7a77f1ec5ae0
Author: Jorge Bay Gondra <jorgebaygon...@gmail.com>
AuthorDate: Fri Feb 22 10:14:30 2019 +0100
Remove unused param from ResponseMessageSerializer and CHANGELOG entry
---
CHANGELOG.asciidoc | 4 ++++
.../gremlin/driver/ser/GraphBinaryMessageSerializerV1.java | 5 ++---
.../tinkerpop/gremlin/driver/ser/binary/GraphBinaryWriter.java | 1 +
.../gremlin/driver/ser/binary/RequestMessageSerializer.java | 3 +--
.../gremlin/driver/ser/binary/ResponseMessageSerializer.java | 7 +++----
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b75a3db..f60c48e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,10 @@ This release also includes changes from <<release-3-3-6,
3.3.6>>.
* Added easier to understand exceptions for connection problems in the
Gremlin.Net driver.
* Support configuring the type registry builder for GraphBinary.
* Release working buffers in case of failure for GraphBinary.
+* GraphBinary: Use the same `ByteBuf` instance to write during serialization.
Changed signature of write methods in type
+serializers.
+* Remove unused parameter in GraphBinary's `ResponseMessageSerializer`.
+
[[release-3-4-0]]
=== TinkerPop 3.4.0 (Release Date: January 2, 2019)
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
index 0d9b59c..c368562 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.CompositeByteBuf;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.ser.binary.GraphBinaryIo;
@@ -123,7 +122,7 @@ public class GraphBinaryMessageSerializerV1 extends
AbstractMessageSerializer {
final ByteBuf buffer = allocator.buffer();
try {
- responseSerializer.writeValue(responseMessage, buffer, writer,
false);
+ responseSerializer.writeValue(responseMessage, buffer, writer);
} catch (Exception ex) {
buffer.release();
throw ex;
@@ -153,7 +152,7 @@ public class GraphBinaryMessageSerializerV1 extends
AbstractMessageSerializer {
@Override
public ResponseMessage deserializeResponse(final ByteBuf msg) throws
SerializationException {
- return responseSerializer.readValue(msg, reader, false);
+ return responseSerializer.readValue(msg, reader);
}
@Override
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryWriter.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryWriter.java
index 46fb05a..68ccc7a 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryWriter.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryWriter.java
@@ -28,6 +28,7 @@ public class GraphBinaryWriter {
private final TypeSerializerRegistry registry;
private final static byte VALUE_FLAG_NULL = 1;
private final static byte VALUE_FLAG_NONE = 0;
+ public final static byte VERSION_BYTE = (byte)0x81;
private final static byte[] unspecifiedNullBytes = new byte[] {
DataType.UNSPECIFIED_NULL.getCodeByte(), 0x01};
private final static byte[] customTypeCodeBytes = new byte[] {
DataType.CUSTOM.getCodeByte() };
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
index b7373a3..42f70cd 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.driver.ser.binary;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
@@ -51,7 +50,7 @@ public class RequestMessageSerializer {
public void writeValue(final RequestMessage value, final ByteBuf buffer,
final GraphBinaryWriter context) throws SerializationException {
// Version
- buffer.writeByte(0x81);
+ buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
// RequestId
context.writeValue(value.getRequestId(), buffer, false);
// Op
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
index cbe8278..70f2a4f 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.driver.ser.binary;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseResult;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatus;
@@ -31,7 +30,7 @@ import java.util.UUID;
public class ResponseMessageSerializer {
- public ResponseMessage readValue(final ByteBuf buffer, final
GraphBinaryReader context, final boolean nullable) throws
SerializationException {
+ public ResponseMessage readValue(final ByteBuf buffer, final
GraphBinaryReader context) throws SerializationException {
final int version = buffer.readByte() & 0xff;
if (version >>> 7 != 1) {
@@ -49,12 +48,12 @@ public class ResponseMessageSerializer {
.create();
}
- public void writeValue(final ResponseMessage value, final ByteBuf buffer,
final GraphBinaryWriter context, final boolean nullable) throws
SerializationException {
+ public void writeValue(final ResponseMessage value, final ByteBuf buffer,
final GraphBinaryWriter context) throws SerializationException {
final ResponseResult result = value.getResult();
final ResponseStatus status = value.getStatus();
// Version
- buffer.writeByte(0x81);
+ buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
// Nullable request id
context.writeValue(value.getRequestId(), buffer, true);
// Status code
