You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2022/01/11 12:27:17 UTC
[tinkerpop] 01/01: TINKERPOP-2639 Removed Gryo MessageSerializers
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2639
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 72a1f76a910ce38b07245299331603f54c9cb0d5
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Dec 30 21:43:02 2021 -0500
TINKERPOP-2639 Removed Gryo MessageSerializers
---
CHANGELOG.asciidoc | 2 +-
.../gremlin-server-integration-krb5.yaml | 4 -
.../gremlin-server-integration-secure.yaml | 4 -
.../gremlin-server/gremlin-server-integration.yaml | 4 -
docs/src/dev/io/gryo.asciidoc | 6 +-
docs/src/reference/gremlin-applications.asciidoc | 37 +-
docs/src/reference/gremlin-variants.asciidoc | 8 +-
docs/src/reference/intro.asciidoc | 10 +-
docs/src/upgrade/release-3.6.x.asciidoc | 18 +-
.../resources/archetype-resources/README.asciidoc | 2 -
.../console/jsr223/DriverGremlinPlugin.java | 4 -
.../ser/AbstractGryoMessageSerializerV1d0.java | 298 ---------
.../ser/AbstractGryoMessageSerializerV3d0.java | 264 --------
.../driver/ser/GryoMessageSerializerV1d0.java | 58 --
.../driver/ser/GryoMessageSerializerV3d0.java | 58 --
.../tinkerpop/gremlin/driver/ser/SerTokens.java | 18 -
.../tinkerpop/gremlin/driver/ser/Serializers.java | 27 +-
.../ser/GraphSONMessageSerializerV1d0Test.java | 2 +-
.../ser/GraphSONMessageSerializerV2d0Test.java | 2 +-
.../driver/ser/GryoMessageSerializerV1d0Test.java | 713 ---------------------
.../remote/GryoRemoteGraphComputerProvider.java | 141 ----
.../driver/remote/GryoRemoteGraphProvider.java | 30 -
.../remote/GryoRemoteGraphProcessComputerTest.java | 34 -
.../remote/GryoRemoteGraphProcessStandardTest.java | 33 -
.../gremlin/server/GremlinDriverIntegrateTest.java | 61 +-
.../server/GremlinResultSetIntegrateTest.java | 17 +-
.../server/GremlinServerAuthKrb5IntegrateTest.java | 12 -
.../gremlin/server/GremlinServerIntegrateTest.java | 19 -
.../src/test/resources/conf/remote-objects.yaml | 2 +-
.../gremlin/server/gremlin-server-integration.yaml | 4 -
30 files changed, 32 insertions(+), 1860 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 83a29b1..3f79def 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -43,7 +43,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Packaged Gherkin tests and data as standalone package as a convenience distribution.
* Removed `ProductiveByStrategy` as a strategy that is applied by default.
* Changed `by()` modulator semantics to consistently filter.
-* Removed previously deprecated `application/vnd.gremlin-v1.0+gryo-lite` serialization format.
+* Removed previously deprecated Gryo `MessageSerializer` implementations.
* Removed previously deprecated `AuthenticationSettings.enableAuditLog`.
* Removed previously deprecated `GroovyTranslator` from `gremlin-groovy` module.
* Removed previously deprecated Gremlin steps that conflicted with Python keywords.
diff --git a/docker/gremlin-server/gremlin-server-integration-krb5.yaml b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
index f0bae2b..e7205be 100644
--- a/docker/gremlin-server/gremlin-server-integration-krb5.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
@@ -34,10 +34,6 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 47b7333..1739375 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -34,10 +34,6 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
index 808ad31..1d1ec91 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -35,10 +35,6 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
diff --git a/docs/src/dev/io/gryo.asciidoc b/docs/src/dev/io/gryo.asciidoc
index 15bafd2..ca6c0b0 100644
--- a/docs/src/dev/io/gryo.asciidoc
+++ b/docs/src/dev/io/gryo.asciidoc
@@ -123,10 +123,6 @@ Gryo over other serialization format should yield smaller data sizes than other
improved serialization speed, as well as better support for the various Java data types that might not be supported
otherwise.
-Gryo is useful both as a "graph" serialization format and as a generalized serialization format that can read or
-write any object. This characteristic makes it ideal for use in Gremlin Server, which is designed to return arbitrary
-results of varying types.
-
It is unlikely that Gryo users will try to consume or produce Gryo without using TinkerPop and Kryo classes to help do
it. Attempting to read or write a byte stream of Gryo without those tools would be challenging, so the depths of
what the Gryo format looks like in a byte-by-byte perspective will not be discussed here. It is enough to know that
@@ -160,6 +156,8 @@ As of TinkerPop 3.3.0, there is now a new version of Gryo in 3.0 that is only pa
to use 3.0 serializers with 1.0 serializers will likely lead to failure. For best results, users should always
utilize the same version of TinkerPop on the client as on the server.
+IMPORTANT: As of 3.6.0, Gryo `MessageSerializer` implementations have been removed from the codebase.
+
Both versions of Gryo support all the types defined by GraphSON as well as others that are bound more specifically
to the JVM. The link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java[GryoVersion]
class contains a listing of all the default registered classes.
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 43cdaf6..608ce3a 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1100,9 +1100,8 @@ by other serializers that also support it.
The format of the serialization is configured by the `serializers` setting described in the table above. Note that
some serializers have additional configuration options as defined by the `serializers[X].config` setting. The
`config` setting is a `Map` where the keys and values get passed to the serializer at its initialization. The
-available and/or expected keys are dependent on the serializer being used. Gremlin Server comes packaged with three
-different serializers: GraphSON, Gryo, and GraphBinary (however, GraphSON and GraphBinary are the only two configured
-by default).
+available and/or expected keys are dependent on the serializer being used. Gremlin Server comes packaged with two
+different serializers: GraphSON and GraphBinary.
===== GraphSON
@@ -1164,38 +1163,6 @@ not support text serialization (i.e. `MessageTextSerializer`) which means that i
results to the HTTP endpoint in Gremlin Server. GraphSON 1.0 must be configured with `application/json` using the
`GraphSONMessageSerializerV1d0` as demonstrated above.
-===== Gryo
-
-WARNING: Gryo is no longer the recommended serialization format for Gremlin Server. Consider using
-<<server-graphbinary, GraphBinary>> instead.
-
-The Gryo serializer utilizes Kryo-based serialization which produces a binary output. This format is best consumed
-by JVM-based languages. The format itself is described in the
-link:https://tinkerpop.apache.org/docs/current/dev/io/#gryo[IO Documentation].
-
-[source,yaml]
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerGremlinV3d0 }
-
-It has the MIME type of `application/vnd.gremlin-v3.0+gryo` and the following configuration options:
-
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Key |Description |Default
-|bufferSize |The maximum size of the Kryo buffer for use on a single object being serialized. Increasing this value will correct `KryoException` errors that complain of "Buffer too small". |_4096_
-|classResolverSupplier |The fully qualified classname of a custom `Supplier<ClassResolver>` which will be used when constructing `Kryo` instances. There is no direct default for this setting, but without a setting the `GryoClassResolver` is used. |_none_
-|custom |A list of classes with custom kryo `Serializer` implementations related to them in the form of `<class>;<serializer-class>`. |_none_
-|ioRegistries |A list of `IoRegistry` implementations to be applied to the serializer. |_none_
-|serializeResultToString |When set to `true`, results are serialized by first calling `toString()` on each object in the result list resulting in an extended MIME Type of `application/vnd.gremlin-v1.0+gryo-stringd`. When set to `false` Kryo-based serialization is applied. |_false_
-|=========================================================
-
-As described above, there are multiple ways in which to register serializers for Kryo-based serialization. Note
-that the `ioRegistries` setting is applied first, followed by the `custom` setting.
-
-Those configuring or implementing a `Supplier<ClassResolver>` should consider this an "advanced" option and typically
-important to use cases where server types need to be coerced to client types (i.e. a type is available on the server
-but not on the client). Implementations should typically instantiate `ClassResolver` implementations that are
-extensions of the `GryoClassResolver` as this class is important to most serialization tasks in TinkerPop.
-
[[server-graphbinary]]
===== GraphBinary
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index ca331d8..f9e1f71 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -311,7 +311,7 @@ documentation as Java covers both embedded and remote use cases.
Remote systems like Gremlin Server and Remote Gremlin Providers respond to requests made in a particular serialization
format and respond by serializing results to some format to be interpreted by the client. For JVM-based languages,
-there are three options for serialization: Gryo, GraphSON and GraphBinary. It is important that the client and server
+there are two options for serialization: GraphSON and GraphBinary. It is important that the client and server
have the same serializers configured in the same way or else one or the other will experience serialization exceptions
and fail to always communicate. Discrepancy in serializer registration between client and server can happen fairly
easily as different graph systems may automatically include serializers on the server-side, thus leaving the client
@@ -331,12 +331,10 @@ GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cli
The `IoRegistry` tells the serializer what classes from the graph provider to auto-register during serialization.
Gremlin Server roughly uses this same approach when it configures its serializers, so using this same model will
-ensure compatibility when making requests. Obviously, it is possible to switch to GraphSON or Gryo by using
-the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV3d0` or `GryoMessageSerializerV3d0` respectively)
+ensure compatibility when making requests. Obviously, it is possible to switch to GraphSON or GraphBinary by using
+the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV3d0` or `GraphBinaryMessageSerializerV1d0` respectively)
in the same way and building that into the `Cluster` object.
-NOTE: Gryo is no longer the preferred binary serialization format for Gremlin Server - please prefer GraphBinary.
-
[[gremlin-java-lambda]]
=== The Lambda Solution
diff --git a/docs/src/reference/intro.asciidoc b/docs/src/reference/intro.asciidoc
index 83b5640..3af5a12 100644
--- a/docs/src/reference/intro.asciidoc
+++ b/docs/src/reference/intro.asciidoc
@@ -434,13 +434,9 @@ touch upon important concepts to focus on here.
The first of these points is serialization. When Gremlin Server receives a request, the results must be serialized to
the form requested by the client and then the client deserializes those into objects native to the language. TinkerPop
-has three such formats that it uses with link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphbinary[GraphBinary],
-link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#gryo[Gryo] and
-link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphson[GraphSON]. Among these serialization formats, users
-should prefer GraphBinary as it combines the best features of both GraphSON and Gryo and it provides the most even
-user experience across different programming languages. There are areas however where this is not quite true, as
-Gremlin Language Variants don't have full GTMs present and therefore don't have the complete means to accomplish what
-a pure JVM solution would.
+has two such formats that it uses with link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphbinary[GraphBinary] and
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphson[GraphSON]. Users should prefer GraphBinary when available
+in the programming language being used.
A good example is the `subgraph()`-step which returns a `Graph` instance as its result. The subgraph returned from
the server can be deserialized into an actual `Graph` instance on the client, which then means it is possible to
diff --git a/docs/src/upgrade/release-3.6.x.asciidoc b/docs/src/upgrade/release-3.6.x.asciidoc
index 5789d22..c848940 100644
--- a/docs/src/upgrade/release-3.6.x.asciidoc
+++ b/docs/src/upgrade/release-3.6.x.asciidoc
@@ -511,18 +511,12 @@ maintain it independently. The following classes were removed as of this change
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2593[TINKERPOP-2593]
-==== GryoLite
-
-The `application/vnd.gremlin-v1.0+gryo-lite` from the `GryoLiteMessageSerializerV1d0` was long ago deprecated in 3.2.6
-when its functionality was quickly replaced by detachment traversal strategies. The traversal strategy approach was
-more flexibly and handled the process more cleanly without the need for additional serialization code and configuration
-in the driver and server. "Gryo Lite" really didn't have much time to be adopted before the new approach was
-implemented yet TinkerPop maintained it for possible backward compatible needs.
-
-Since that time, all of Gryo network serialization has been deprecated in favor of GraphBinary and while it probably
-doesn't make sense at this time to completely remove Gryo, the removal of this "lite" serializer should cause little
-trouble for those upgrading to 3.6.0 and perhaps herald a warning to switch to GraphBinary as soon as possible if still
-on Gryo.
+==== Removed Gryo MessageSerializers
+
+Gryo `MessageSerializer` implementations were deprecated at 3.4.3 (GryoLite at 3.2.6) in favor of GraphBinary. As
+GraphBinary has been the default implementation for some time now and given that Gryo is a JVM-only format which
+reduces its usability within Gremlin Language Variants, it seemed like the right time to remove the Gryo
+`MessageSerializer` implementations from the code base. Gryo may still be used for file based applications.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2639[TINKERPOP-2639]
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
index 14d6373..6dce08f 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
@@ -57,8 +57,6 @@ $ bin/gremlin-server.sh conf/gremlin-server-modern.yaml
[INFO] OpLoader - Adding the session OpProcessor.
[INFO] GremlinServer - Executing start up LifeCycleHook
[INFO] Logger$info - Loading 'modern' graph data.
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 8 and boss thread pool of 1.
[INFO] GremlinServer$1 - Channel started at port 8182.
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
index 7b2f2a9..3eb750e 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
@@ -40,8 +40,6 @@ import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
@@ -80,8 +78,6 @@ public class DriverGremlinPlugin extends AbstractGremlinPlugin {
GraphSONMessageSerializerGremlinV2d0.class,
GraphSONMessageSerializerV1d0.class,
GraphSONMessageSerializerV2d0.class,
- GryoMessageSerializerV1d0.class,
- GryoMessageSerializerV3d0.class,
GraphBinaryMessageSerializerV1.class,
MessageTextSerializer.class,
SerializationException.class,
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
deleted file mode 100644
index 368b6bb..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
-import org.apache.tinkerpop.shaded.kryo.ClassResolver;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.4.3, replaced by {@link GraphBinaryMessageSerializerV1}.
- */
-@Deprecated
-public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageSerializer<Kryo> {
- private GryoMapper gryoMapper;
- private ThreadLocal<Kryo> kryoThreadLocal = new ThreadLocal<Kryo>() {
- @Override
- protected Kryo initialValue() {
- return gryoMapper.createMapper();
- }
- };
-
- private static final Charset UTF8 = Charset.forName("UTF-8");
-
- public static final String TOKEN_CUSTOM = "custom";
- public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
-
- public static final String TOKEN_BUFFER_SIZE = "bufferSize";
- public static final String TOKEN_CLASS_RESOLVER_SUPPLIER = "classResolverSupplier";
-
- protected boolean serializeToString = false;
- private int bufferSize = 4096;
-
- /**
- * Creates an instance with a provided mapper configured {@link GryoMapper} instance. Note that this instance
- * will be overridden by {@link #configure} is called.
- */
- public AbstractGryoMessageSerializerV1d0(final GryoMapper kryo) {
- this.gryoMapper = kryo;
- }
-
- /**
- * Called from the {@link #configure(Map, Map)} method right before the call to create the builder. Sub-classes
- * can choose to alter the builder or completely replace it.
- */
- GryoMapper.Builder configureBuilder(final GryoMapper.Builder builder, final Map<String, Object> config,
- final Map<String, Graph> graphs) {
- return builder;
- }
-
- @Override
- public Kryo getMapper() {
- return kryoThreadLocal.get();
- }
-
- @Override
- public final void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GryoMapper.Builder builder = GryoMapper.build().version(GryoVersion.V1_0);
- addIoRegistries(config, builder);
- addClassResolverSupplier(config, builder);
- addCustomClasses(config, builder);
-
- this.serializeToString = Boolean.parseBoolean(config.getOrDefault(TOKEN_SERIALIZE_RESULT_TO_STRING, "false").toString());
- this.bufferSize = Integer.parseInt(config.getOrDefault(TOKEN_BUFFER_SIZE, "4096").toString());
-
- this.gryoMapper = configureBuilder(builder, config, graphs).create();
- }
-
- private void addClassResolverSupplier(final Map<String, Object> config, final GryoMapper.Builder builder) {
- final String className = (String) config.getOrDefault(TOKEN_CLASS_RESOLVER_SUPPLIER, null);
- if (className != null && !className.isEmpty()) {
- try {
- final Class<?> clazz = Class.forName(className);
- try {
- final Method instanceMethod = tryInstanceMethod(clazz);
- builder.classResolver((Supplier<ClassResolver>) instanceMethod.invoke(null));
- } catch (Exception methodex) {
- // tried instance() and that failed so try newInstance() no-arg constructor
- builder.classResolver((Supplier<ClassResolver>) clazz.newInstance());
- }
- } catch (Exception ex) {
- throw new IllegalStateException(ex);
- }
- }
- }
-
- private void addCustomClasses(final Map<String, Object> config, final GryoMapper.Builder builder) {
- final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
-
- classNameList.stream().forEach(serializerDefinition -> {
- String className;
- Optional<String> serializerName;
- if (serializerDefinition.contains(";")) {
- final String[] split = serializerDefinition.split(";");
- if (split.length != 2)
- throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
-
- className = split[0];
- serializerName = Optional.of(split[1]);
- } else {
- serializerName = Optional.empty();
- className = serializerDefinition;
- }
-
- try {
- final Class clazz = Class.forName(className);
- final Serializer serializer;
- if (serializerName.isPresent()) {
- final Class serializerClazz = Class.forName(serializerName.get());
- serializer = (Serializer) serializerClazz.newInstance();
- builder.addCustom(clazz, kryo -> serializer);
- } else
- builder.addCustom(clazz);
- } catch (Exception ex) {
- throw new IllegalStateException("Class could not be found", ex);
- }
- });
- }
-
- @Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
- try {
- final Kryo kryo = kryoThreadLocal.get();
- final byte[] payload = new byte[msg.capacity()];
- msg.readBytes(payload);
- try (final Input input = new Input(payload)) {
- final UUID requestId = kryo.readObjectOrNull(input, UUID.class);
- final int status = input.readShort();
- final String statusMsg = input.readString();
- final Map<String,Object> statusAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
- final Object result = kryo.readClassAndObject(input);
- final Map<String,Object> metaAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
-
- return ResponseMessage.build(requestId)
- .code(ResponseStatusCode.getFromValue(status))
- .statusMessage(statusMsg)
- .statusAttributes(statusAttributes)
- .result(result)
- .responseMetaData(metaAttributes)
- .create();
- }
- } catch (Exception ex) {
- logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV1d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final Kryo kryo = kryoThreadLocal.get();
- try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- final Output output = new Output(baos, bufferSize);
-
- // request id - if present
- kryo.writeObjectOrNull(output, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null, UUID.class);
-
- // status
- output.writeShort(responseMessage.getStatus().getCode().getValue());
- output.writeString(responseMessage.getStatus().getMessage());
- kryo.writeClassAndObject(output, responseMessage.getStatus().getAttributes());
-
- // result
- kryo.writeClassAndObject(output, serializeToString ? serializeResultToString(responseMessage) : responseMessage.getResult().getData());
- kryo.writeClassAndObject(output, responseMessage.getResult().getMeta());
-
- final long size = output.total();
- if (size > Integer.MAX_VALUE)
- throw new SerializationException(String.format("Message size of %s exceeds allocatable space", size));
-
- output.flush();
- encodedMessage = allocator.buffer((int) size);
- encodedMessage.writeBytes(baos.toByteArray());
- }
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGryoMessageSerializerV1d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
- try {
- final Kryo kryo = kryoThreadLocal.get();
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- try (final Input input = new Input(payload)) {
- // by the time the message gets here, the mime length/type have been already read, so this part just
- // needs to process the payload.
- final UUID id = kryo.readObject(input, UUID.class);
- final String processor = input.readString();
- final String op = input.readString();
-
- final RequestMessage.Builder builder = RequestMessage.build(op)
- .overrideRequestId(id)
- .processor(processor);
-
- final Map<String, Object> args = kryo.readObject(input, HashMap.class);
- args.forEach(builder::addArg);
- return builder.create();
- }
- } catch (Exception ex) {
- logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV1d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final Kryo kryo = kryoThreadLocal.get();
- try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- final Output output = new Output(baos, bufferSize);
- final String mimeType = mimeTypesSupported()[0];
- output.writeByte(mimeType.length());
- output.write(mimeType.getBytes(UTF8));
-
- kryo.writeObject(output, requestMessage.getRequestId());
- output.writeString(requestMessage.getProcessor());
- output.writeString(requestMessage.getOp());
- kryo.writeObject(output, requestMessage.getArgs());
-
- final long size = output.total();
- if (size > Integer.MAX_VALUE)
- throw new SerializationException(String.format("Message size of %s exceeds allocatable space", size));
-
- output.flush();
- encodedMessage = allocator.buffer((int) size);
- encodedMessage.writeBytes(baos.toByteArray());
- }
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGryoMessageSerializerV1d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- private Object serializeResultToString(final ResponseMessage msg) {
- if (msg.getResult() == null) return "null";
- if (msg.getResult().getData() == null) return "null";
-
- // the IteratorHandler should return a collection so keep it as such
- final Object o = msg.getResult().getData();
- if (o instanceof Collection) {
- return ((Collection) o).stream().map(d -> null == d ? "null" : d.toString()).collect(Collectors.toList());
- } else {
- return o.toString();
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
deleted file mode 100644
index 0affc90..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
-import org.apache.tinkerpop.shaded.kryo.ClassResolver;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.4.3, replaced by {@link GraphBinaryMessageSerializerV1}.
- */
-@Deprecated
-public abstract class AbstractGryoMessageSerializerV3d0 extends AbstractMessageSerializer<Kryo> {
- private GryoMapper gryoMapper;
- private ThreadLocal<Kryo> kryoThreadLocal = new ThreadLocal<Kryo>() {
- @Override
- protected Kryo initialValue() {
- return gryoMapper.createMapper();
- }
- };
-
- private static final Charset UTF8 = Charset.forName("UTF-8");
-
- public static final String TOKEN_CUSTOM = "custom";
- public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
- public static final String TOKEN_BUFFER_SIZE = "bufferSize";
- public static final String TOKEN_CLASS_RESOLVER_SUPPLIER = "classResolverSupplier";
-
- protected boolean serializeToString = false;
- private int bufferSize = 4096;
-
- /**
- * Creates an instance with a provided mapper configured {@link GryoMapper} instance. Note that this instance
- * will be overridden by {@link #configure} is called.
- */
- public AbstractGryoMessageSerializerV3d0(final GryoMapper kryo) {
- this.gryoMapper = kryo;
- }
-
- @Override
- public Kryo getMapper() {
- return kryoThreadLocal.get();
- }
-
- /**
- * Called from the {@link #configure(Map, Map)} method right before the call to create the builder. Sub-classes
- * can choose to alter the builder or completely replace it.
- */
- GryoMapper.Builder configureBuilder(final GryoMapper.Builder builder, final Map<String, Object> config,
- final Map<String, Graph> graphs) {
- return builder;
- }
-
- @Override
- public final void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GryoMapper.Builder builder = GryoMapper.build().version(GryoVersion.V3_0);
- addIoRegistries(config, builder);
- addClassResolverSupplier(config, builder);
- addCustomClasses(config, builder);
-
- this.serializeToString = Boolean.parseBoolean(config.getOrDefault(TOKEN_SERIALIZE_RESULT_TO_STRING, "false").toString());
- this.bufferSize = Integer.parseInt(config.getOrDefault(TOKEN_BUFFER_SIZE, "4096").toString());
-
- this.gryoMapper = configureBuilder(builder, config, graphs).create();
- }
-
- private void addClassResolverSupplier(final Map<String, Object> config, final GryoMapper.Builder builder) {
- final String className = (String) config.getOrDefault(TOKEN_CLASS_RESOLVER_SUPPLIER, null);
- if (className != null && !className.isEmpty()) {
- try {
- final Class<?> clazz = Class.forName(className);
- try {
- final Method instanceMethod = tryInstanceMethod(clazz);
- builder.classResolver((Supplier<ClassResolver>) instanceMethod.invoke(null));
- } catch (Exception methodex) {
- // tried instance() and that failed so try newInstance() no-arg constructor
- builder.classResolver((Supplier<ClassResolver>) clazz.newInstance());
- }
- } catch (Exception ex) {
- throw new IllegalStateException(ex);
- }
- }
- }
-
- private void addCustomClasses(final Map<String, Object> config, final GryoMapper.Builder builder) {
- final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
-
- classNameList.stream().forEach(serializerDefinition -> {
- String className;
- Optional<String> serializerName;
- if (serializerDefinition.contains(";")) {
- final String[] split = serializerDefinition.split(";");
- if (split.length != 2)
- throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
-
- className = split[0];
- serializerName = Optional.of(split[1]);
- } else {
- serializerName = Optional.empty();
- className = serializerDefinition;
- }
-
- try {
- final Class clazz = Class.forName(className);
- final Serializer serializer;
- if (serializerName.isPresent()) {
- final Class serializerClazz = Class.forName(serializerName.get());
- serializer = (Serializer) serializerClazz.newInstance();
- builder.addCustom(clazz, kryo -> serializer);
- } else
- builder.addCustom(clazz);
- } catch (Exception ex) {
- throw new IllegalStateException("Class could not be found", ex);
- }
- });
- }
-
- @Override
- public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
- try {
- final Kryo kryo = kryoThreadLocal.get();
- final byte[] payload = new byte[msg.capacity()];
- msg.readBytes(payload);
- try (final Input input = new Input(payload)) {
- return kryo.readObject(input, ResponseMessage.class);
- }
- } catch (Exception ex) {
- logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV3d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final Kryo kryo = kryoThreadLocal.get();
- try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- final Output output = new Output(baos, bufferSize);
- final ResponseMessage msgToWrite = !serializeToString ? responseMessage :
- ResponseMessage.build(responseMessage.getRequestId())
- .code(responseMessage.getStatus().getCode())
- .statusAttributes(responseMessage.getStatus().getAttributes())
- .responseMetaData(responseMessage.getResult().getMeta())
- .result(serializeResultToString(responseMessage))
- .statusMessage(responseMessage.getStatus().getMessage()).create();
- kryo.writeObject(output, msgToWrite);
-
- final long size = output.total();
- if (size > Integer.MAX_VALUE)
- throw new SerializationException(String.format("Message size of %s exceeds allocatable space", size));
-
- output.flush();
- encodedMessage = allocator.buffer((int) size);
- encodedMessage.writeBytes(baos.toByteArray());
- }
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGryoMessageSerializerV3d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
- try {
- final Kryo kryo = kryoThreadLocal.get();
- final byte[] payload = new byte[msg.readableBytes()];
- msg.readBytes(payload);
- try (final Input input = new Input(payload)) {
- // by the time the message gets here, the mime length/type have been already read, so this part just
- // needs to process the payload.
- return kryo.readObject(input, RequestMessage.class);
- }
- } catch (Exception ex) {
- logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGryoMessageSerializerV3d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- @Override
- public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
- ByteBuf encodedMessage = null;
- try {
- final Kryo kryo = kryoThreadLocal.get();
- try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- final Output output = new Output(baos, bufferSize);
- final String mimeType = mimeTypesSupported()[0];
- output.writeByte(mimeType.length());
- output.write(mimeType.getBytes(UTF8));
-
- kryo.writeObject(output, requestMessage);
-
- final long size = output.total();
- if (size > Integer.MAX_VALUE)
- throw new SerializationException(String.format("Message size of %s exceeds allocatable space", size));
-
- output.flush();
- encodedMessage = allocator.buffer((int) size);
- encodedMessage.writeBytes(baos.toByteArray());
- }
-
- return encodedMessage;
- } catch (Exception ex) {
- if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
- logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGryoMessageSerializerV3d0.class.getName()), ex);
- throw new SerializationException(ex);
- }
- }
-
- private Object serializeResultToString(final ResponseMessage msg) {
- if (msg.getResult() == null) return "null";
- if (msg.getResult().getData() == null) return "null";
-
- // the IteratorHandler should return a collection so keep it as such
- final Object o = msg.getResult().getData();
- if (o instanceof Collection) {
- return ((Collection) o).stream().map(d -> null == d ? "null" : d.toString()).collect(Collectors.toList());
- } else {
- return o.toString();
- }
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index f97710f..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-
-/**
- * The standard Gryo serializer that uses "detached" graph elements during serialization. Detached elements such as
- * {@link DetachedVertex} include the label and the properties associated with it which could be more costly for
- * network serialization purposes.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.4.3, replaced by {@link GraphBinaryMessageSerializerV1}.
- */
-@Deprecated
-public final class GryoMessageSerializerV1d0 extends AbstractGryoMessageSerializerV1d0 {
-
- private static final String MIME_TYPE = SerTokens.MIME_GRYO_V1D0;
- private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRYO_V1D0 + "-stringd";
-
- /**
- * Creates an instance with a standard {@link GryoMapper} instance.
- */
- public GryoMessageSerializerV1d0() {
- super(GryoMapper.build().version(GryoVersion.V1_0).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.version(GryoVersion.V1_0).create());
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV3d0.java
deleted file mode 100644
index 1f1ccb8..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV3d0.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-
-/**
- * The standard Gryo serializer that uses "detached" graph elements during serialization. Detached elements such as
- * {@link DetachedVertex} include the label and the properties associated with it which could be more costly for
- * network serialization purposes.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.4.3, replaced by {@link GraphBinaryMessageSerializerV1}.
- */
-@Deprecated
-public final class GryoMessageSerializerV3d0 extends AbstractGryoMessageSerializerV3d0 {
-
- private static final String MIME_TYPE = SerTokens.MIME_GRYO_V3D0;
- private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRYO_V3D0 + "-stringd";
-
- /**
- * Creates an instance with a standard {@link GryoMapper} instance.
- */
- public GryoMessageSerializerV3d0() {
- super(GryoMapper.build().version(GryoVersion.V3_0).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 GryoMessageSerializerV3d0(final GryoMapper.Builder kryo) {
- super(kryo.version(GryoVersion.V3_0).create());
- }
-
- @Override
- public String[] mimeTypesSupported() {
- return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
- }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
index 5ccb8dd..5e0c292 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
@@ -42,23 +42,5 @@ public final class SerTokens {
public static final String MIME_GRAPHSON_V1D0 = "application/vnd.gremlin-v1.0+json";
public static final String MIME_GRAPHSON_V2D0 = "application/vnd.gremlin-v2.0+json";
public static final String MIME_GRAPHSON_V3D0 = "application/vnd.gremlin-v3.0+json";
-
- /**
- * @deprecated As of release 3.4.3, replaced by {@link #MIME_GRAPHBINARY_V1D0}.
- */
- @Deprecated
- public static final String MIME_GRYO_V1D0 = "application/vnd.gremlin-v1.0+gryo";
-
- /**
- * @deprecated As of release 3.4.3, replaced by {@link #MIME_GRAPHBINARY_V1D0}.
- */
- @Deprecated
- public static final String MIME_GRYO_V3D0 = "application/vnd.gremlin-v3.0+gryo";
-
- /**
- * @deprecated As of release 3.2.6, not directly replaced - supported through {@link HaltedTraverserStrategy}.
- */
- @Deprecated
- public static final String MIME_GRYO_LITE_V1D0 = "application/vnd.gremlin-v1.0+gryo-lite";
public static final String MIME_GRAPHBINARY_V1D0 = "application/vnd.graphbinary-v1.0";
}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
index fb2bc8a..334467a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
@@ -35,25 +35,7 @@ public enum Serializers {
GRAPHSON_V1D0(SerTokens.MIME_GRAPHSON_V1D0),
GRAPHSON_V2D0(SerTokens.MIME_GRAPHSON_V2D0),
GRAPHSON_V3D0(SerTokens.MIME_GRAPHSON_V3D0),
- GRAPHBINARY_V1D0(SerTokens.MIME_GRAPHBINARY_V1D0),
-
- /**
- * @deprecated As of release 3.4.3, replaced by {@link #GRAPHBINARY_V1D0}.
- */
- @Deprecated
- GRYO_V1D0(SerTokens.MIME_GRYO_V1D0),
-
- /**
- * @deprecated As of release 3.4.3, replaced by {@link #GRAPHBINARY_V1D0}.
- */
- @Deprecated
- GRYO_V3D0(SerTokens.MIME_GRYO_V3D0),
-
- /**
- * @deprecated As of release 3.2.6, not directly replaced - supported through {@link HaltedTraverserStrategy}.
- */
- @Deprecated
- GRYO_LITE_V1D0(SerTokens.MIME_GRYO_LITE_V1D0);
+ GRAPHBINARY_V1D0(SerTokens.MIME_GRAPHBINARY_V1D0);
private String value;
@@ -68,17 +50,12 @@ public enum Serializers {
public MessageSerializer<?> simpleInstance() {
switch (value) {
case SerTokens.MIME_JSON:
+ case SerTokens.MIME_GRAPHSON_V3D0:
return new GraphSONMessageSerializerV3d0();
case SerTokens.MIME_GRAPHSON_V1D0:
return new GraphSONMessageSerializerGremlinV1d0();
case SerTokens.MIME_GRAPHSON_V2D0:
return new GraphSONMessageSerializerV2d0();
- case SerTokens.MIME_GRAPHSON_V3D0:
- return new GraphSONMessageSerializerV3d0();
- case SerTokens.MIME_GRYO_V1D0:
- return new GryoMessageSerializerV1d0();
- case SerTokens.MIME_GRYO_V3D0:
- return new GryoMessageSerializerV3d0();
case SerTokens.MIME_GRAPHBINARY_V1D0:
return new GraphBinaryMessageSerializerV1();
default:
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
index dcce186..4c4b7a2 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
@@ -79,7 +79,7 @@ public class GraphSONMessageSerializerV1d0Test {
public void shouldConfigureIoRegistry() throws Exception {
final GraphSONMessageSerializerV1d0 serializer = new GraphSONMessageSerializerV1d0();
final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+ put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
}};
serializer.configure(config, null);
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
index e34309c..aea1995 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
@@ -95,7 +95,7 @@ public class GraphSONMessageSerializerV2d0Test {
public void shouldConfigureIoRegistry() throws Exception {
final GraphSONMessageSerializerV1d0 serializer = new GraphSONMessageSerializerV1d0();
final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+ put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
}};
serializer.configure(config, null);
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0Test.java
deleted file mode 100644
index 3ef4221..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1d0;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.kryo.ClassResolver;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.KryoException;
-import org.apache.tinkerpop.shaded.kryo.Registration;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Supplier;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Parameterized.class)
-public class GryoMessageSerializerV1d0Test {
- @Parameterized.Parameters(name = "expect({0})")
- public static Iterable<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"V1d0", (Supplier<?>) GryoMessageSerializerV1d0::new},
- {"V3d0", (Supplier<?>) GryoMessageSerializerV3d0::new}});
- }
-
- @Parameterized.Parameter(value = 0)
- public String name;
-
- @Parameterized.Parameter(value = 1)
- public Supplier<MessageSerializer<?>> serializerSupplier;
-
- private static final Map<String, Object> configForText = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
- }};
-
- private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- @Test
- public void shouldConfigureIoRegistry() throws Exception {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Collections.singletonList(ColorIoRegistry.class.getName()));
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(requestId).result(Color.RED).create();
- final ByteBuf bb = serializer.serializeResponseAsBinary(toSerialize, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertCommon(deserialized);
- assertEquals(Color.RED, deserialized.getResult().getData());
- }
-
- @Test
- public void shouldConfigureIoRegistryInstance() throws Exception {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Collections.singletonList(ColorIoRegistryInstance.class.getName()));
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(requestId).result(Color.RED).create();
- final ByteBuf bb = serializer.serializeResponseAsBinary(toSerialize, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertCommon(deserialized);
- assertEquals(Color.RED, deserialized.getResult().getData());
- }
-
- @Test
- public void shouldConfigureIoRegistryGetInstance() throws Exception {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Collections.singletonList(ColorIoRegistryGetInstance.class.getName()));
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- final ResponseMessage toSerialize = ResponseMessage.build(requestId).result(Color.RED).create();
- final ByteBuf bb = serializer.serializeResponseAsBinary(toSerialize, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertCommon(deserialized);
- assertEquals(Color.RED, deserialized.getResult().getData());
- }
-
- @Test
- public void shouldConfigureCustomClassResolver() {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_CLASS_RESOLVER_SUPPLIER, ErrorOnlyClassResolverSupplier.class.getName());
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- try {
- serializer.serializeResponseAsBinary(responseMessageBuilder.create(), allocator);
- fail("Should fail because the ClassResolver used here always generates an error");
- } catch (Exception ex) {
- assertEquals("java.lang.RuntimeException: Registration is not allowed with this ClassResolver - it is not a good implementation", ex.getMessage());
- }
- }
-
- @Test
- public void shouldConfigureCustomClassResolverFromInstance() {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_CLASS_RESOLVER_SUPPLIER, ErrorOnlyClassResolverSupplierAsInstance.class.getName());
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- try {
- serializer.serializeResponseAsBinary(responseMessageBuilder.create(), allocator);
- fail("Should fail because the ClassResolver used here always generates an error");
- } catch (Exception ex) {
- assertEquals("java.lang.RuntimeException: Registration is not allowed with this ClassResolver - it is not a good implementation", ex.getMessage());
- }
- }
-
- @Test
- public void shouldConfigureCustomClassResolverFromGetInstance() {
- final Map<String, Object> config = new HashMap<String, Object>() {{
- put(GryoMessageSerializerV1d0.TOKEN_CLASS_RESOLVER_SUPPLIER, ErrorOnlyClassResolverSupplierAsGetInstance.class.getName());
- }};
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(config, null);
-
- try {
- serializer.serializeResponseAsBinary(responseMessageBuilder.create(), allocator);
- fail("Should fail because the ClassResolver used here always generates an error");
- } catch (Exception ex) {
- assertEquals("java.lang.RuntimeException: Registration is not allowed with this ClassResolver - it is not a good implementation", ex.getMessage());
- }
- }
-
- @Test
- public void shouldSerializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final java.util.List<Integer> deserializedFunList = (java.util.List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertEquals(new Integer(100), deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableToString() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convertText(list);
- assertCommon(response);
-
- final java.util.List deserializedFunList = (java.util.List) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals("1", deserializedFunList.get(0));
- assertEquals("100", deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableToStringWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convertText(list);
- assertCommon(response);
-
- final java.util.List deserializedFunList = (java.util.List) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals("1", deserializedFunList.get(0).toString());
- assertEquals("null", deserializedFunList.get(1).toString());
- assertEquals("100", deserializedFunList.get(2).toString());
- }
-
- @Test
- public void shouldSerializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final java.util.List<Integer> deserializedFunList = (java.util.List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(new Integer(100), deserializedFunList.get(2));
- }
-
- @Test
- public void shouldSerializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convertBinary(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void shouldSerializeMapEntry() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final ResponseMessage response = convertBinary(IteratorUtils.asList(map.entrySet()));
- assertCommon(response);
-
- final java.util.List<Map.Entry<Object, Object>> deserializedEntries = (java.util.List<Map.Entry<Object, Object>>) response.getResult().getData();
- assertEquals(3, deserializedEntries.size());
- deserializedEntries.forEach(e -> {
- if (e.getKey().equals("x"))
- assertEquals(1, e.getValue());
- else if (e.getKey().equals(v1))
- assertEquals(100, e.getValue());
- else if (e.getKey().equals(d))
- assertEquals("test", e.getValue());
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeTree() throws Exception {
- final Graph g = TinkerFactory.createModern();
- final Tree t = g.traversal().V().out().out().tree().by("name").next();
-
- final ResponseMessage response = convertBinary(t);
- assertCommon(response);
-
- final Tree deserialized = (Tree) response.getResult().getData();
- assertEquals(t, deserialized);
-
- assertThat(deserialized.containsKey("marko"), is(true));
- assertEquals(1, deserialized.size());
-
- final Tree markoChildren = (Tree) deserialized.get("marko");
- assertThat(markoChildren.containsKey("josh"), is(true));
- assertEquals(1, markoChildren.size());
-
- final Tree joshChildren = (Tree) markoChildren.get("josh");
- assertThat(joshChildren.containsKey("lop"), is(true));
- assertThat(joshChildren.containsKey("ripple"), is(true));
- assertEquals(2, joshChildren.size());
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- @Test
- public void shouldHaveTooSmallBufferToSerializeResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final MessageSerializer<Kryo> binarySerializerWithSmallBuffer = new GryoMessageSerializerV1d0();
- final Map<String, Object> configWithSmallBuffer = new HashMap<String, Object>() {{
- put("bufferSize", 1);
- }};
- binarySerializerWithSmallBuffer.configure(configWithSmallBuffer, null);
-
- try {
- binarySerializerWithSmallBuffer.serializeResponseAsBinary(response, allocator);
- fail("Should have a buffer size that is too small");
- } catch (Exception ex) {
- final Throwable root = ExceptionUtils.getRootCause(ex);
- assertThat(root, instanceOf(KryoException.class));
- }
- }
-
- @Test
- public void shouldReturnAllBytesInResponse() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final MessageSerializer<Kryo> binarySerializerWithSmallBuffer = new GryoMessageSerializerV1d0();
- final Map<String, Object> configWithSmallBuffer = new HashMap<String, Object>() {{
- // set to bufferSize < total message size but still greater than any individual object requires
- put("bufferSize", 50);
- }};
- binarySerializerWithSmallBuffer.configure(configWithSmallBuffer, null);
-
- final ByteBuf buf = binarySerializerWithSmallBuffer.serializeResponseAsBinary(response, allocator);
- assertTrue(buf.isReadable());
- assertEquals(82, buf.readableBytes());
- }
-
- @Test
- public void shouldSerializeFullRequestMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final RequestMessage request = RequestMessage.build("try")
- .overrideRequestId(id)
- .processor("pro")
- .addArg("test", "this")
- .create();
-
- final MessageSerializer<?> serializer = serializerSupplier.get();
- final ByteBuf bb = serializer.serializeRequestAsBinary(request, allocator);
- final int mimeLen = bb.readByte();
- bb.readBytes(new byte[mimeLen]);
- final RequestMessage deserialized = serializer.deserializeRequest(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("pro", deserialized.getProcessor());
- assertEquals("try", deserialized.getOp());
- assertEquals("this", deserialized.getArgs().get("test"));
- }
-
- @Test
- public void shouldHaveTooSmallBufferToSerializeRequestMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final RequestMessage request = RequestMessage.build("try")
- .overrideRequestId(id)
- .processor("pro")
- .addArg("test", "this")
- .create();
-
- final MessageSerializer<Kryo> binarySerializerWithSmallBuffer = new GryoMessageSerializerV1d0();
- final Map<String, Object> configWithSmallBuffer = new HashMap<String, Object>() {{
- put("bufferSize", 1);
- }};
- binarySerializerWithSmallBuffer.configure(configWithSmallBuffer, null);
-
- try {
- binarySerializerWithSmallBuffer.serializeRequestAsBinary(request, allocator);
- fail("Should have a buffer size that is too small");
- } catch (Exception ex) {
- final Throwable root = ExceptionUtils.getRootCause(ex);
- assertThat(root, instanceOf(KryoException.class));
- }
- }
-
- @Test
- public void shouldReturnAllBytesInRequest() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final RequestMessage request = RequestMessage.build("try")
- .overrideRequestId(id)
- .processor("pro")
- .addArg("test", "this")
- .create();
-
- final MessageSerializer<Kryo> binarySerializerWithSmallBuffer = new GryoMessageSerializerV1d0();
- final Map<String, Object> configWithSmallBuffer = new HashMap<String, Object>() {{
- // set to bufferSize < total message size but still greater than any individual object requires
- put("bufferSize", 50);
- }};
- binarySerializerWithSmallBuffer.configure(configWithSmallBuffer, null);
-
- ByteBuf buf = binarySerializerWithSmallBuffer.serializeRequestAsBinary(request, allocator);
- assertTrue(buf.isReadable());
- assertEquals(71, buf.readableBytes());
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
-
- final ResponseMessage response = convertBinary(iterable);
- assertCommon(response);
-
- final java.util.List<DetachedEdge> edgeList = (java.util.List<DetachedEdge>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final DetachedEdge deserializedEdge = edgeList.get(0);
- assertEquals(e.id(), deserializedEdge.id());
- assertEquals("test", deserializedEdge.label());
-
- assertEquals(123, deserializedEdge.values("abc").next());
- assertEquals(1, IteratorUtils.count(deserializedEdge.properties()));
- assertEquals(v1.id(), deserializedEdge.outVertex().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.outVertex().label());
- assertEquals(v2.id(), deserializedEdge.inVertex().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.inVertex().label());
- }
-
- @Test
- public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final java.util.List list = IteratorUtils.list(g.vertices());
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final java.util.List<DetachedVertex> vertexList = (java.util.List<DetachedVertex>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final DetachedVertex deserializedVertex = vertexList.get(0);
- assertEquals(0l, deserializedVertex.id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
-
- assertEquals(1, IteratorUtils.count(deserializedVertex.properties()));
-
- final java.util.List<Object> deserializedInnerList = (java.util.List<Object>) deserializedVertex.values("friends").next();
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void shouldSerializeToMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final ResponseMessage response = convertBinary(map);
- assertCommon(response);
-
- final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
-
- final Vertex deserializedMarko = deserializedMap.keySet().iterator().next();
- assertEquals("marko", deserializedMarko.values("name").next().toString());
- assertEquals(1, deserializedMarko.id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedMarko.label());
- assertEquals(29, deserializedMarko.values("age").next());
- assertEquals(2, IteratorUtils.count(deserializedMarko.properties()));
-
- assertEquals(new Integer(1000), deserializedMap.values().iterator().next());
- }
-
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convertBinary(final Object toSerialize) throws SerializationException {
- final MessageSerializer<?> serializer = serializerSupplier.get();
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-
- private ResponseMessage convertText(final Object toSerialize) throws SerializationException {
- final MessageSerializer<?> serializer = serializerSupplier.get();
- serializer.configure(configForText, null);
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-
- public static class ErrorOnlyClassResolverSupplierAsInstance implements Supplier<ClassResolver> {
-
- private static final ErrorOnlyClassResolverSupplierAsInstance instance = new ErrorOnlyClassResolverSupplierAsInstance();
-
- private ErrorOnlyClassResolverSupplierAsInstance() {}
-
- public static ErrorOnlyClassResolverSupplierAsInstance instance() {
- return instance;
- }
-
- @Override
- public ClassResolver get() {
- return new ErrorOnlyClassResolver();
- }
- }
-
- public static class ErrorOnlyClassResolverSupplierAsGetInstance implements Supplier<ClassResolver> {
-
- private static final ErrorOnlyClassResolverSupplierAsInstance instance = new ErrorOnlyClassResolverSupplierAsInstance();
-
- private ErrorOnlyClassResolverSupplierAsGetInstance() {}
-
- public static ErrorOnlyClassResolverSupplierAsInstance getInstance() {
- return instance;
- }
-
- @Override
- public ClassResolver get() {
- return new ErrorOnlyClassResolver();
- }
- }
-
- public static class ErrorOnlyClassResolverSupplier implements Supplier<ClassResolver> {
- @Override
- public ClassResolver get() {
- return new ErrorOnlyClassResolver();
- }
- }
-
- public static class ErrorOnlyClassResolver extends GryoClassResolverV1d0 {
- @Override
- public Registration getRegistration(Class clazz) {
- throw new RuntimeException("Registration is not allowed with this ClassResolver - it is not a good implementation");
- }
- }
-
- public static class ColorIoRegistry extends AbstractIoRegistry {
- public ColorIoRegistry() {
- register(GryoIo.class, Color.class, new ColorSerializer());
- }
- }
-
- public static class ColorIoRegistryInstance extends AbstractIoRegistry {
-
- private static final ColorIoRegistry instance = new ColorIoRegistry();
-
- private ColorIoRegistryInstance() {
- register(GryoIo.class, Color.class, new ColorSerializer());
- }
-
- public static ColorIoRegistry instance() {
- return instance;
- }
- }
-
- public static class ColorIoRegistryGetInstance extends AbstractIoRegistry {
-
- private static final ColorIoRegistry instance = new ColorIoRegistry();
-
- private ColorIoRegistryGetInstance() {
- register(GryoIo.class, Color.class, new ColorSerializer());
- }
-
- public static ColorIoRegistry getInstance() {
- return instance;
- }
- }
-
- public static class ColorSerializer extends Serializer<Color> {
- @Override
- public void write(final Kryo kryo, final Output output, final Color color) {
- output.write(color.equals(Color.RED) ? 1 : 0);
- }
-
- @Override
- public Color read(final Kryo kryo, final Input input, final Class<Color> aClass) {
- return input.read() == 1 ? Color.RED : Color.BLACK;
- }
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java
deleted file mode 100644
index e7f46ee..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest",
- method = "*",
- reason = "The addEdge() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest",
- method = "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest",
- method = "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_V_outXknowsX_V_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest",
- method = "g_VX1X_V_valuesXnameX",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest",
- method = "*",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MathTest",
- method = "g_withSackX1X_injectX1X_repeatXsackXsumX_byXconstantX1XXX_timesX5X_emit_mathXsin__X_byXsackX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest",
- method = "g_V_foo_injectX9999999999X_min",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalTest",
- method = "g_VX1X_optionalXaddVXdogXX_label",
- reason = "The addV() step is not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathTest",
- method = "g_V_asXaX_out_asXbX_out_asXcX_simplePath_byXlabelX_fromXbX_toXcX_path_byXnameX",
- reason = "It is not possible to access more than a path element's id on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexTest",
- method = "g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name",
- reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack",
- reason = "One bulk is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest",
- method = "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
- reason = "One bulk is currently not supported on GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest",
- method = "g_injectXg_VX1X_propertiesXnameX_nextX_value",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest",
- method = "g_injectXnull_10_5_nullX_sum",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest",
- method = "g_injectXlistXnull_10_5_nullXX_sumXlocalX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest",
- method = "g_injectXlistXnull_10_20_nullXX_meanXlocalX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest",
- method = "g_injectXnull_10_20_nullX_mean",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest",
- method = "g_withSideEffectXk_nullX_injectXxX_selectXkX",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest",
- method = "*",
- reason = "The io() step is not supported generally by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest",
- method = "*",
- reason = "The io() step is not supported generally by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest",
- method = "g_V_hasXk_withinXcXX_valuesXkX",
- reason = "Requires some test data initialization with addV()")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest",
- method = "g_injectX1_null_nullX_path",
- reason = "The inject() step is not supported by GraphComputer")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest",
- method = "g_injectX1_null_nullX_path_dedup",
- reason = "The inject() step is not supported by GraphComputer")
-@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class GryoRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
-
- public GryoRemoteGraphComputerProvider() {
- super(createClusterBuilder(Serializers.GRYO_V3D0).create(), true);
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java
deleted file mode 100644
index 9e13797..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.remote;
-
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GryoRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
- public GryoRemoteGraphProvider() {
- super(createClusterBuilder(Serializers.GRYO_V3D0).create());
- }
-}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java
deleted file mode 100644
index cfee38f..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.process.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.GryoRemoteGraphComputerProvider;
-import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = GryoRemoteGraphComputerProvider.class, graph = RemoteGraph.class)
-public class GryoRemoteGraphProcessComputerTest {
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java
deleted file mode 100644
index 87f4b6f..0000000
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.remote;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.driver.remote.GryoRemoteGraphProvider;
-import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = GryoRemoteGraphProvider.class, graph = RemoteGraph.class)
-public class GryoRemoteGraphProcessStandardTest {
-}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 03bf909..fc616f0 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
@@ -37,8 +36,6 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
@@ -882,46 +879,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
- public void shouldSerializeToStringWhenRequestedGryoV1() throws Exception {
- final Map<String, Object> m = new HashMap<>();
- m.put("serializeResultToString", true);
- final GryoMessageSerializerV1d0 serializer = new GryoMessageSerializerV1d0();
- serializer.configure(m, null);
-
- final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
- final Client client = cluster.connect();
-
- try {
- final ResultSet resultSet = client.submit("TinkerFactory.createClassic()");
- final List<Result> results = resultSet.all().join();
- assertEquals(1, results.size());
- assertEquals("tinkergraph[vertices:6 edges:6]", results.get(0).getString());
- } finally {
- cluster.close();
- }
- }
-
- @Test
- public void shouldSerializeToStringWhenRequestedGryoV3() throws Exception {
- final Map<String, Object> m = new HashMap<>();
- m.put("serializeResultToString", true);
- final GryoMessageSerializerV3d0 serializer = new GryoMessageSerializerV3d0();
- serializer.configure(m, null);
-
- final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
- final Client client = cluster.connect();
-
- try {
- final ResultSet resultSet = client.submit("TinkerFactory.createClassic()");
- final List<Result> results = resultSet.all().join();
- assertEquals(1, results.size());
- assertEquals("tinkergraph[vertices:6 edges:6]", results.get(0).getString());
- } finally {
- cluster.close();
- }
- }
-
- @Test
public void shouldWorkWithGraphSONV1Serialization() throws Exception {
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0).create();
final Client client = cluster.connect();
@@ -1472,7 +1429,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasTraversalSourceVariables() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V3D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
final Client client = cluster.connect();
try {
try {
@@ -1486,8 +1443,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
final Client clientAliased = client.alias("g1");
- final Vertex v = clientAliased.submit("g.addV().property('name','jason')").all().get().get(0).getVertex();
- assertEquals("jason", v.value("name"));
+ final String name = clientAliased.submit("g.addV().property('name','jason').values('name')").all().get().get(0).getString();
+ assertEquals("jason", name);
} finally {
cluster.close();
}
@@ -1495,7 +1452,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasGraphVariablesInSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V3D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -1512,8 +1469,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
try {
final Client aliased = cluster.connect(name.getMethodName()).alias("graph");
assertEquals("jason", aliased.submit("n='jason'").all().get().get(0).getString());
- final Vertex v = aliased.submit("g.addVertex('name',n)").all().get().get(0).getVertex();
- assertEquals("jason", v.value("name"));
+ final String name = aliased.submit("g.addVertex('name',n).values('name')").all().get().get(0).getString();
+ assertEquals("jason", name);
} finally {
cluster.close();
}
@@ -1521,7 +1478,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasTraversalSourceVariablesInSession() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V3D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -1536,8 +1493,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client clientAliased = client.alias("g1");
assertEquals("jason", clientAliased.submit("n='jason'").all().get().get(0).getString());
- final Vertex v = clientAliased.submit("g.addV().property('name',n)").all().get().get(0).getVertex();
- assertEquals("jason", v.value("name"));
+ final String name = clientAliased.submit("g.addV().property('name',n).values('name')").all().get().get(0).getString();
+ assertEquals("jason", name);
cluster.close();
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index fff8cdf..5500315 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -25,8 +25,6 @@ import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
@@ -79,21 +77,8 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
public static Iterable<Object[]> data() {
final MessageSerializer<GraphBinaryMapper> graphBinaryMessageSerializerV1 = new GraphBinaryMessageSerializerV1();
- // must configure Gryo with "custom" since it's configured on the server
- final MessageSerializer<Kryo> gryoMessageSerializerV3d0 = new GryoMessageSerializerV3d0();
- final Map<String,Object> gryoV3d0Config = new HashMap<>();
- gryoV3d0Config.put("ioRegistries", Collections.singletonList(TinkerIoRegistryV3d0.class.getName()));
- gryoMessageSerializerV3d0.configure(gryoV3d0Config, null);
-
- final MessageSerializer<Kryo> gryoMessageSerializerV1d0 = new GryoMessageSerializerV1d0();
- final Map<String,Object> gryoV1d0Config = new HashMap<>();
- gryoV1d0Config.put("ioRegistries", Collections.singletonList(TinkerIoRegistryV3d0.class.getName()));
- gryoMessageSerializerV1d0.configure(gryoV1d0Config, null);
-
return Arrays.asList(new Object[][]{
- {Serializers.GRAPHBINARY_V1D0, graphBinaryMessageSerializerV1},
- {Serializers.GRYO_V3D0, gryoMessageSerializerV3d0},
- {Serializers.GRYO_V1D0, gryoMessageSerializerV1d0},
+ {Serializers.GRAPHBINARY_V1D0, graphBinaryMessageSerializerV1}
});
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
index 6307a03..47254fb 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
@@ -25,8 +25,6 @@ import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.server.auth.Krb5Authenticator;
import org.ietf.jgss.GSSException;
import org.junit.Test;
@@ -205,16 +203,6 @@ public class GremlinServerAuthKrb5IntegrateTest extends AbstractGremlinServerInt
}
@Test
- public void shouldAuthenticateWithSerializeResultToStringGryoV1() throws Exception {
- assertAuthViaToStringWithSpecifiedSerializer(new GryoMessageSerializerV1d0());
- }
-
- @Test
- public void shouldAuthenticateWithSerializeResultToStringGryoV3() throws Exception {
- assertAuthViaToStringWithSpecifiedSerializer(new GryoMessageSerializerV3d0());
- }
-
- @Test
public void shouldAuthenticateWithSerializeResultToStringGraphBinaryV1() throws Exception {
assertAuthViaToStringWithSpecifiedSerializer(new GraphBinaryMessageSerializerV1());
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 9ecc7d0..1210c61 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -882,25 +882,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
}
- @Test
- public void shouldReceiveFailureOnBadGryoSerialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V1D0).create();
- final Client client = cluster.connect();
-
- try {
- client.submit("java.awt.Color.RED").all().join();
- fail("Should throw an exception.");
- } catch (RuntimeException re) {
- final Throwable root = ExceptionUtils.getRootCause(re);
- assertThat(root.getMessage(), CoreMatchers.startsWith("Error during serialization: Class is not registered: java.awt.Color"));
-
- // validate that we can still send messages to the server
- assertEquals(2, client.submit("1+1").all().join().get(0).getInt());
- } finally {
- cluster.close();
- }
- }
-
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Test
public void shouldBlockRequestWhenTooBig() throws Exception {
diff --git a/gremlin-server/src/test/resources/conf/remote-objects.yaml b/gremlin-server/src/test/resources/conf/remote-objects.yaml
index 957166f..b32ba79 100644
--- a/gremlin-server/src/test/resources/conf/remote-objects.yaml
+++ b/gremlin-server/src/test/resources/conf/remote-objects.yaml
@@ -29,4 +29,4 @@
hosts: [localhost]
port: 45940
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0 }
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index c626317..0365046 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -48,10 +48,6 @@ scriptEngines: {
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}