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 2019/07/26 15:06:54 UTC
[tinkerpop] 01/02: Merge branch 'pr-1145' into tp34
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 3cc72e176d1846d047b83edb75494e4792520409
Merge: 8fca63b f1ef99d
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 26 10:19:09 2019 -0400
Merge branch 'pr-1145' into tp34
CHANGELOG.asciidoc | 2 ++
.../console/jsr223/DriverRemoteAcceptor.java | 4 +++
.../apache/tinkerpop/gremlin/driver/Client.java | 1 +
.../tinkerpop/gremlin/driver/RequestOptions.java | 15 ++++++++++
.../apache/tinkerpop/gremlin/driver/Tokens.java | 1 +
.../driver/remote/DriverRemoteConnection.java | 9 ++++--
.../driver/remote/DriverRemoteConnectionTest.java | 2 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 35 ++++++++++++++++++++++
8 files changed, 66 insertions(+), 3 deletions(-)
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
index 16bacf6,3101992..94d04de
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
@@@ -59,61 -47,15 +59,62 @@@ public final class Tokens
public static final String ARGS_MANAGE_TRANSACTION = "manageTransaction";
public static final String ARGS_SASL = "sasl";
public static final String ARGS_SASL_MECHANISM = "saslMechanism";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String ARGS_SIDE_EFFECT = "sideEffect";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String ARGS_AGGREGATE_TO = "aggregateTo";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String ARGS_SIDE_EFFECT_KEY = "sideEffectKey";
+ public static final String ARGS_USER_AGENT = "userAgent";
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String VAL_AGGREGATE_TO_BULKSET = "bulkset";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String VAL_AGGREGATE_TO_LIST = "list";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String VAL_AGGREGATE_TO_MAP = "map";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String VAL_AGGREGATE_TO_NONE = "none";
+
+ /**
+ * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
+ * traversal iteration is not being promoted anymore as a feature.
+ */
+ @Deprecated
public static final String VAL_AGGREGATE_TO_SET = "set";
public static final String VAL_TRAVERSAL_SOURCE_ALIAS = "g";