Improved error messaging on request/response serialization/deserialization CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/97947c1a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/97947c1a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/97947c1a Branch: refs/heads/TINKERPOP-1857 Commit: 97947c1a60e399a4f53e2b3e60c4bef60bdbc94f Parents: 4e284c0 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Feb 9 14:02:48 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Feb 9 14:02:48 2018 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java | 8 ++++---- .../driver/ser/AbstractGryoMessageSerializerV1d0.java | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97947c1a/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c562ccd..9dcb7f0 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Added the "Kitchen Sink" test data set. * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers exceeded the Integer limits. * Delayed setting of the request identifier until `RequestMessage` construction by the builder. +* Improved error messaging for failed serialization and deserialization of request/response messages. * Removed hardcoded expectation in metrics serialization test suite as different providers may have different outputs. * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus improving performance when used. * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra iteration when doing `Vertex` lookups. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97947c1a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java index 9527224..ab79ec9 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java @@ -118,7 +118,7 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess } catch (Exception ex) { if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage); - logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName()); + logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -138,7 +138,7 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess } catch (Exception ex) { if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage); - logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName()); + logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -150,7 +150,7 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess msg.readBytes(payload); return mapper.readValue(payload, RequestMessage.class); } catch (Exception ex) { - logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()); + logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -162,7 +162,7 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess msg.readBytes(payload); return mapper.readValue(payload, ResponseMessage.class); } catch (Exception ex) { - logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()); + logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex); throw new SerializationException(ex); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97947c1a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java index c79c124..868f5b5 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java @@ -198,7 +198,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS .create(); } } catch (Exception ex) { - logger.warn("Response [{}] could not be deserialized by {}.", msg, GryoMessageSerializerV1d0.class.getName()); + logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV1d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -236,7 +236,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS } catch (Exception ex) { if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage); - logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), GryoMessageSerializerV1d0.class.getName()); + logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGryoMessageSerializerV1d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -263,7 +263,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS return builder.create(); } } catch (Exception ex) { - logger.warn("Request [{}] could not be deserialized by {}.", msg, GryoMessageSerializerV1d0.class.getName()); + logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV1d0.class.getName()), ex); throw new SerializationException(ex); } } @@ -297,7 +297,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS } catch (Exception ex) { if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage); - logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), GryoMessageSerializerV1d0.class.getName()); + logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGryoMessageSerializerV1d0.class.getName()), ex); throw new SerializationException(ex); } }
