This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a change to branch valentyn/connection-pooling
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 1c726292d8 connection pooling clean up
add e01da9690a Create MessageSerializerV4s and remove MessageSerializer.
(#2576)
add 61f634ef42 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../console/jsr223/DriverGremlinPlugin.java | 38 +-
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 57 +-
.../GraphSONMapperPartialEmbeddedTypeTest.java | 3 +
.../structure/io/graphson/GraphSONMapperTest.java | 7 +-
.../src/main/java/examples/Connections.java | 8 +-
.../tinkerpop/gremlin/driver/Channelizer.java | 4 +-
.../apache/tinkerpop/gremlin/driver/Cluster.java | 30 +-
.../tinkerpop/gremlin/driver/RequestOptions.java | 4 +-
.../apache/tinkerpop/gremlin/driver/Settings.java | 8 +-
.../driver/handler/GremlinResponseHandler.java | 8 +-
.../driver/handler/HttpGremlinRequestEncoder.java | 11 +-
.../HttpGremlinResponseDebugStreamDecoder.java | 8 +-
.../handler/HttpGremlinResponseStreamDecoder.java | 10 +-
.../gremlin/driver/simple/AbstractClient.java | 18 +-
.../gremlin/driver/simple/SimpleClient.java | 15 +-
.../gremlin/driver/simple/SimpleHttpClient.java | 4 +-
.../gremlin/driver/util/ProfilingApplication.java | 6 +-
.../gremlin/driver/ClusterConfigTest.java | 32 +-
.../gremlin/driver/RequestMessageTest.java | 56 --
.../WebSocketClientBehaviorIntegrateTest.java | 536 ------------------
.../gremlin/server/AbstractChannelizer.java | 35 +-
.../tinkerpop/gremlin/server/GraphManager.java | 14 +-
.../apache/tinkerpop/gremlin/server/Settings.java | 12 +-
.../gremlin/server/auth/Authenticator.java | 8 +-
.../handler/HttpBasicAuthorizationHandler.java | 6 -
.../server/handler/HttpGremlinEndpointHandler.java | 25 +-
.../gremlin/server/handler/HttpHandlerUtil.java | 13 +-
.../server/handler/HttpRequestIdHandler.java | 4 +-
.../server/handler/HttpRequestMessageDecoder.java | 52 +-
.../server/handler/SaslAuthenticationHandler.java | 170 ------
.../gremlin/server/handler/ServerSerializers.java | 10 +-
.../tinkerpop/gremlin/server/handler/StateKey.java | 8 +-
.../gremlin/server/util/GremlinError.java | 2 +-
...izer.java => TextPlainMessageSerializerV4.java} | 73 ++-
.../driver/ClientConnectionIntegrateTest.java | 2 -
.../driver/remote/AbstractRemoteGraphProvider.java | 4 +-
.../GraphBinaryRemoteGraphComputerProvider.java | 4 +-
.../remote/GraphBinaryRemoteGraphProvider.java | 4 +-
.../GraphSONRemoteGraphComputerProvider.java | 4 +-
.../driver/remote/GraphSONRemoteGraphProvider.java | 4 +-
.../gremlin/driver/remote/RemoteWorld.java | 12 +-
.../gremlin/server/GremlinDriverIntegrateTest.java | 153 ++---
.../server/GremlinResultSetIntegrateTest.java | 12 +-
.../server/GremlinServerAuthIntegrateTest.java | 15 +-
.../server/GremlinServerAuthKrb5IntegrateTest.java | 8 +-
.../server/GremlinServerHttpIntegrateTest.java | 141 +++--
.../gremlin/server/GremlinServerIntegrateTest.java | 18 +-
.../GremlinServerSerializationIntegrateTest.java | 16 +-
.../handler/HttpRequestMessageDecoderTest.java | 18 +-
.../notifications/ProviderGraphManagerHelper.java | 11 +-
....java => TextPlainMessageSerializerV4Test.java} | 20 +-
.../gremlin/driver/SerializationBenchmark.java | 41 +-
.../gremlin/socket/server/SocketServerRunner.java | 9 +-
.../gremlin/socket/server/TestChannelizers.java | 105 ----
.../socket/server/TestWSGremlinInitializer.java | 195 -------
...ageSerializer.java => MessageSerializerV4.java} | 52 +-
.../org/apache/tinkerpop/gremlin/util/Tokens.java | 17 +-
.../gremlin/util/message/RequestMessage.java | 180 ------
.../gremlin/util/message/RequestMessageV4.java | 2 +
...ResponseMessage.java => ResponseMessageV4.java} | 72 +--
.../{ResponseStatus.java => ResponseStatusV4.java} | 6 +-
.../AbstractGraphBinaryMessageSerializerV1.java | 275 ---------
.../ser/AbstractGraphSONMessageSerializerV1.java | 229 --------
.../ser/AbstractGraphSONMessageSerializerV2.java | 306 ----------
.../ser/AbstractGraphSONMessageSerializerV4.java | 216 ++++---
...lizer.java => AbstractMessageSerializerV4.java} | 6 +-
.../util/ser/GraphBinaryMessageSerializerV1.java | 78 ---
.../util/ser/GraphBinaryMessageSerializerV4.java | 165 ++++--
.../util/ser/GraphSONMessageSerializerV1.java | 125 ----
.../util/ser/GraphSONMessageSerializerV2.java | 136 -----
.../util/ser/GraphSONMessageSerializerV3.java | 138 -----
.../util/ser/GraphSONMessageSerializerV4.java | 33 +-
.../ser/GraphSONUntypedMessageSerializerV1.java | 126 -----
.../ser/GraphSONUntypedMessageSerializerV2.java | 129 -----
.../ser/GraphSONUntypedMessageSerializerV3.java | 128 -----
.../ser/GraphSONUntypedMessageSerializerV4.java | 16 +-
.../gremlin/util/ser/MessageTextSerializer.java | 42 --
.../gremlin/util/ser/MessageTextSerializerV4.java | 66 ---
.../util/ser/RequestMessageGryoSerializer.java | 57 --
.../util/ser/ResponseMessageGryoSerializer.java | 67 ---
.../ser/{Serializers.java => SerializersV4.java} | 59 +-
.../util/ser/binary/RequestMessageSerializer.java | 83 ---
.../ser/binary/RequestMessageSerializerV4.java | 10 +-
...lizer.java => ResponseMessageSerializerV4.java} | 23 +-
.../io/AbstractTypedCompatibilityTest.java | 356 ++++++------
.../io/AbstractUntypedCompatibilityTest.java | 380 ++++++-------
.../tinkerpop/gremlin/structure/io/Model.java | 71 +--
.../graphbinary/GraphBinaryCompatibilityTest.java | 9 +-
.../graphson/GraphSONTypedCompatibilityTest.java | 6 +-
.../graphson/GraphSONUntypedCompatibilityTest.java | 8 +-
.../AbstractGraphSONMessageSerializerV1Test.java | 53 --
...> AbstractGraphSONMessageSerializerV4Test.java} | 5 +-
.../util/ser/GraphSONMessageSerializerV1Test.java | 335 -----------
.../util/ser/GraphSONMessageSerializerV2Test.java | 627 ---------------------
.../util/ser/GraphSONMessageSerializerV3Test.java | 420 --------------
... GraphSONMessageSerializerV4RoundTripTest.java} | 20 +-
.../util/ser/GraphSONMessageSerializerV4Test.java | 137 ++++-
.../GraphSONUntypedMessageSerializerV1Test.java | 512 -----------------
.../GraphSONUntypedMessageSerializerV2Test.java | 471 ----------------
.../GraphSONUntypedMessageSerializerV3Test.java | 471 ----------------
.../GraphSONUntypedMessageSerializerV4Test.java | 28 +-
.../binary/GraphBinaryMessageSerializerV1Test.java | 279 ---------
.../binary/GraphBinaryMessageSerializerV4Test.java | 75 ++-
.../util/ser/binary/MessageSerializerV4Test.java | 154 +++++
.../types/sample/SamplePersonSerializerTest.java | 21 +-
105 files changed, 1640 insertions(+), 7731 deletions(-)
delete mode 100644
gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
delete mode 100644
gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
delete mode 100644
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
rename
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/{TextPlainMessageSerializer.java
=> TextPlainMessageSerializerV4.java} (50%)
rename
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/{TextPlainMessageSerializerTest.java
=> TextPlainMessageSerializerV4Test.java} (72%)
delete mode 100644
gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java
delete mode 100644
gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/{MessageSerializer.java
=> MessageSerializerV4.java} (61%)
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/{ResponseMessage.java
=> ResponseMessageV4.java} (68%)
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/{ResponseStatus.java
=> ResponseStatusV4.java} (90%)
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphBinaryMessageSerializerV1.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/{AbstractMessageSerializer.java
=> AbstractMessageSerializerV4.java} (93%)
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializerV4.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/{Serializers.java
=> SerializersV4.java} (54%)
delete mode 100644
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
rename
gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/{ResponseMessageSerializer.java
=> ResponseMessageSerializerV4.java} (83%)
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
rename
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/{AbstractGraphSONMessageSerializerV2Test.java
=> AbstractGraphSONMessageSerializerV4Test.java} (89%)
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
rename
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/{GraphSONMessageSerializerV3RoundTripTest.java
=> GraphSONMessageSerializerV4RoundTripTest.java} (73%)
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java
delete mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java
create mode 100644
gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/MessageSerializerV4Test.java
