Fixed some bad refactoring of GryoMessageSerializers Added back a constructor that got accidentally removed. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aa673db1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aa673db1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aa673db1 Branch: refs/heads/TINKERPOP-1278 Commit: aa673db10f1e358e75d57e2dfb1c1c8b78535eb5 Parents: 43d276a Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jun 1 12:57:24 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jun 1 12:57:24 2016 -0400 ---------------------------------------------------------------------- .../ser/GryoLiteMessageSerializerV1d0.java | 10 ++++++++- .../driver/ser/GryoMessageSerializerV1d0.java | 22 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa673db1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java index 14f716d..53825be 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java @@ -57,6 +57,14 @@ public class GryoLiteMessageSerializerV1d0 extends AbstractGryoMessageSerializer super(overrideWithLite(GryoMapper.build()).create()); } + /** + * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance created by the supplied + * builder will be overridden by {@link #configure} if it is called. + */ + public GryoLiteMessageSerializerV1d0(final GryoMapper.Builder kryo) { + super(overrideWithLite(kryo).create()); + } + @Override public String[] mimeTypesSupported() { return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE}; @@ -64,7 +72,7 @@ public class GryoLiteMessageSerializerV1d0 extends AbstractGryoMessageSerializer @Override GryoMapper.Builder configureBuilder(final GryoMapper.Builder builder, final Map<String, Object> config, - final Map<String, Graph> graphs) { + final Map<String, Graph> graphs) { return overrideWithLite(builder); } http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa673db1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java index e9b51d1..445b6cc 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java @@ -36,13 +36,31 @@ public final class GryoMessageSerializerV1d0 extends AbstractGryoMessageSerializ private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRYO_V1D0 + "-stringd"; /** - * Creates an instance with a standard {@link GryoMapper} instance. Note that this instance - * will be overridden by {@link #configure} is called. + * Creates an instance with a standard {@link GryoMapper} instance. */ public GryoMessageSerializerV1d0() { super(GryoMapper.build().create()); } + /** + * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance created by the supplied + * builder will be overridden by {@link #configure} if it is called. + */ + public GryoMessageSerializerV1d0(final GryoMapper.Builder kryo) { + super(kryo.create()); + } + + /** + * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance supplied + * will be overridden by {@link #configure} if it is called. + * + * @deprecated As of release 3.2.1, replaced by {@link GryoMessageSerializerV1d0#GryoMessageSerializerV1d0(GryoMapper.Builder)}. + */ + @Deprecated + public GryoMessageSerializerV1d0(final GryoMapper kryo) { + super(kryo); + } + @Override public String[] mimeTypesSupported() { return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
