pickup changes from master-http

apache · Jun 10, 2024 · baac97f · baac97f
2 parents 9145988 + 999e673
commit baac97f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.../main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java b/.../main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java
@@ -97,6 +97,10 @@ private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder
 
     @Override
     public ByteBuf serializeResponseAsBinary(final ResponseMessageV4 responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        if (null == responseMessage.getStatus()) {
+            throw new SerializationException("ResponseStatusV4 can't be null when serializing a full ResponseMessageV4.");
+        }
+
         return writeHeader(responseMessage, allocator);
     }
 

diff --git a/...l/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.java b/...l/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.java
@@ -186,6 +186,10 @@ public RequestMessageV4 deserializeBinaryRequest(ByteBuf msg) throws Serializati
 
     @Override
     public ByteBuf serializeResponseAsBinary(final ResponseMessageV4 responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        if (null == responseMessage.getStatus()) {
+            throw new SerializationException("ResponseStatusV4 can't be null when serializing a full ResponseMessageV4.");
+        }
+
         return writeHeader(responseMessage, allocator);
     }
 

diff --git a/.../src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java b/.../src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java
@@ -270,7 +270,8 @@ public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws Se
     }
 
     private ResponseMessageV4 convert(final Object toSerialize, MessageSerializerV4<?> serializer) throws SerializationException {
-        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(Collections.singletonList(toSerialize)).create(), allocator);
+        final ByteBuf bb = serializer.serializeResponseAsBinary(
+                responseMessageBuilder.result(Collections.singletonList(toSerialize)).code(HttpResponseStatus.OK).create(), allocator);
         return serializer.deserializeBinaryResponse(bb);
     }
 }
diff --git a/...java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV4Test.java b/...java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV4Test.java
@@ -42,7 +42,7 @@ public class GraphBinaryMessageSerializerV4Test {
     private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
     private final GraphBinaryMessageSerializerV4 serializer = new GraphBinaryMessageSerializerV4();
 
-    private static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
+    public static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
         public static AtomicInteger createCounter = new AtomicInteger();
 
         @Override

diff --git a/...org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java b/...org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
@@ -20,6 +20,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
 import org.apache.tinkerpop.gremlin.util.message.ResponseMessageV4;
 import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4;
@@ -102,11 +103,11 @@ private void assertPerson(final GraphBinaryMessageSerializerV4 serializer) throw
         final SamplePerson person = new SamplePerson("Olivia", birthDate);
 
         final ByteBuf serialized = serializer.serializeResponseAsBinary(
-                ResponseMessageV4.build().result(Collections.singletonList(person)).create(), allocator);
+                ResponseMessageV4.build().result(Collections.singletonList(person)).code(HttpResponseStatus.OK).create(), allocator);
 
         final ResponseMessageV4 deserialized = serializer.deserializeBinaryResponse(serialized);
 
-        final SamplePerson actual = (SamplePerson) deserialized.getResult().getData();
+        final SamplePerson actual = (SamplePerson) deserialized.getResult().getData().get(0);
         assertThat(actual, reflectionEquals(person));
     }