This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a commit to branch master-http
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master-http by this push:
new 275502ca86 remove debugging info from client CTR
275502ca86 is described below
commit 275502ca86f896341ab48f49224923d1255c0326
Author: Valentyn Kahamlyk <valentyn.kaham...@improving.com>
AuthorDate: Wed May 15 11:16:25 2024 -0700
remove debugging info from client CTR
---
.../driver/handler/GremlinResponseHandler.java | 20 +++-----------------
.../driver/handler/HttpGremlinRequestEncoder.java | 4 +---
.../handler/HttpGremlinResponseStreamDecoder.java | 22 ----------------------
3 files changed, 4 insertions(+), 42 deletions(-)
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
index 0efa524ec8..eb1bb37df7 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
@@ -62,23 +62,11 @@ public class GremlinResponseHandler extends
SimpleChannelInboundHandler<Response
protected void channelRead0(final ChannelHandlerContext
channelHandlerContext, final ResponseMessageV4 response) {
final HttpResponseStatus statusCode = response.getStatus() == null ?
HttpResponseStatus.PARTIAL_CONTENT : response.getStatus().getCode();
final ResultQueue queue = pending.get();
- if (response.getResult().getData() != null) {
- System.out.println("GremlinResponseHandler payload size: " +
((List) response.getResult().getData()).size());
- }
if (statusCode == HttpResponseStatus.OK || statusCode ==
HttpResponseStatus.PARTIAL_CONTENT) {
- final Object data = response.getResult().getData();
-
- // this is a "result" from the server which is either the result
of a script or a
- // serialized traversal
- if (data instanceof List) {
- // unrolls the collection into individual results to be
handled by the queue.
- final List<Object> listToUnroll = (List<Object>) data;
- listToUnroll.forEach(item -> queue.add(new Result(item)));
- } else {
- // since this is not a list it can just be added to the queue
- queue.add(new Result(response.getResult().getData()));
- }
+ final List<Object> data = response.getResult().getData();
+ // unrolls the collection into individual results to be handled by
the queue.
+ data.forEach(item -> queue.add(new Result(item)));
} else {
// this is a "success" but represents no results otherwise it is
an error
if (statusCode != HttpResponseStatus.NO_CONTENT) {
@@ -94,8 +82,6 @@ public class GremlinResponseHandler extends
SimpleChannelInboundHandler<Response
current.markComplete(response.getStatus().getAttributes());
}
}
-
- System.out.println("----------------------------");
}
@Override
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index 500e3e1858..c55119af11 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@ -61,7 +61,7 @@ public final class HttpGremlinRequestEncoder extends
MessageToMessageEncoder<Req
@Override
protected void encode(final ChannelHandlerContext channelHandlerContext,
final RequestMessageV4 requestMessage, final List<Object> objects) throws
Exception {
final String mimeType = serializer.mimeTypesSupported()[0];
- // only GraphSON3 and GraphBinary recommended for serialization of
Bytecode requests
+ // only GraphSON4 and GraphBinary4 recommended for serialization of
Bytecode requests
if (requestMessage.getField("gremlin") instanceof Bytecode &&
!mimeType.equals(SerTokens.MIME_GRAPHSON_V4) &&
!mimeType.equals(SerTokens.MIME_GRAPHBINARY_V4)) {
@@ -85,8 +85,6 @@ public final class HttpGremlinRequestEncoder extends
MessageToMessageEncoder<Req
request = interceptor.apply(request);
}
objects.add(request);
-
- System.out.println("----------------------------");
} catch (SerializationException ex) {
throw new ResponseException(HttpResponseStatus.BAD_REQUEST,
String.format(
"An error occurred during serialization of this request
[%s] - it could not be sent to the server - Reason: %s",
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
index 83a294a7b0..825a55ada2 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
@@ -57,13 +57,10 @@ public class HttpGremlinResponseStreamDecoder extends
MessageToMessageDecoder<De
final Attribute<Boolean> isFirstChunk = ((AttributeMap)
ctx).attr(IS_FIRST_CHUNK);
final Attribute<HttpResponseStatus> responseStatus = ((AttributeMap)
ctx).attr(RESPONSE_STATUS);
- System.out.println("HttpGremlinResponseStreamDecoder start");
-
if (msg instanceof HttpResponse) {
responseStatus.set(((HttpResponse) msg).status());
if (isError(((HttpResponse) msg).status())) {
- System.out.println("Error: " + ((HttpResponse) msg).status());
return;
}
@@ -85,27 +82,11 @@ public class HttpGremlinResponseStreamDecoder extends
MessageToMessageDecoder<De
return;
}
- if (isFirstChunk.get()) {
- System.out.println("first chunk");
- } else {
- System.out.println("not first chunk");
- }
-
- System.out.println("payload size in bytes: " + ((HttpContent)
msg).content().readableBytes());
- System.out.println(((HttpContent) msg).content());
-
final ResponseMessageV4 chunk =
serializer.readChunk(((HttpContent) msg).content(), isFirstChunk.get());
- if (chunk.getResult().getData() != null) {
- System.out.println("payload size: " + ((List)
chunk.getResult().getData()).size());
- }
-
if (msg instanceof LastHttpContent) {
final HttpHeaders trailingHeaders = ((LastHttpContent)
msg).trailingHeaders();
- System.out.println("final chunk, trailing headers:");
- System.out.println(trailingHeaders);
-
if (!Objects.equals(trailingHeaders.get("code"), "200")) {
throw new Exception(trailingHeaders.get("message"));
}
@@ -115,12 +96,9 @@ public class HttpGremlinResponseStreamDecoder extends
MessageToMessageDecoder<De
out.add(chunk);
} catch (SerializationException e) {
- System.out.println("Ex: " + e.getMessage());
throw new RuntimeException(e);
}
}
-
- System.out.println("----------------------------");
}
private static boolean isError(final HttpResponseStatus status) {
