This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch travis-fix in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 959af077c70666628795eafc186592ee43786ce4 Merge: 8548860 8156a51 Author: Stephen Mallette <[email protected]> AuthorDate: Tue Oct 13 15:19:59 2020 -0400 Merge branch '3.4-dev' into master CHANGELOG.asciidoc | 2 +- docs/src/reference/gremlin-variants.asciidoc | 40 ++++++++++++++++++---- docs/src/upgrade/release-3.4.x.asciidoc | 32 +++++++++++++++++ .../Driver/Remote/DriverRemoteConnection.cs | 30 ++++++++++++++-- gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 28 ++++++++++----- .../Process/Traversal/GraphTraversalSource.cs | 26 +++++++++----- .../Docs/Reference/GremlinVariantsTests.cs | 18 ++++++++++ .../DriverRemoteConnection/GraphTraversalTests.cs | 15 ++++---- .../apache/tinkerpop/gremlin/driver/Tokens.java | 39 +++++++++++++++++++++ 9 files changed, 196 insertions(+), 34 deletions(-) diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs index f8d0140,1833855..f35b128 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs @@@ -32,6 -32,11 +32,11 @@@ namespace Gremlin.Net.Drive public class Tokens { /// <summary> - /// The key for the unique identifier of the request. ++ /// The key for the unique identifier of the request. + /// </summary> + public static string RequestId = "requestId"; - ++ + /// <summary> /// Operation used by the client to authenticate itself. /// </summary> public static string OpsAuthentication = "authentication"; @@@ -89,7 -107,31 +95,13 @@@ public static string ArgsSession = "session"; /// <summary> - /// Argument name that allows to change the flavor of Gremlin used (e.g. gremlin-groovy). + /// Argument name that allows a value that is a custom string that the user can pass to a server that + /// might accept it for purpose of identifying the kind of client it came from. + /// </summary> + public static string ArgsUserAgent = "userAgent"; + + /// <summary> - /// Argument name that allows to specify the unique identifier for the request. - /// </summary> - [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)] - public static string ArgsSideEffect = "sideEffect"; - - /// <summary> - /// Argument name that allows to specify the key for a specific side-effect. - /// </summary> - [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)] - public static string ArgsSideEffectKey = "sideEffectKey"; - - /// <summary> - /// <see cref="ResponseMessage{T}" /> argument that describes how side-effect data should be treated. - /// </summary> - [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)] - public static string ArgsAggregateTo = "aggregateTo"; - - /// <summary> + /// Argument name that allows definition of the flavor of Gremlin used (e.g. gremlin-groovy) to process the request. /// </summary> public static string ArgsLanguage = "language"; diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java index 867edf2,92641a7..68b5ebd --- 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 @@@ -32,22 -36,133 +36,57 @@@ public final class Tokens public static final String OPS_INVALID = "invalid"; public static final String OPS_CLOSE = "close"; + /** - * @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 OPS_GATHER = "gather"; - - /** - * @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 OPS_KEYS = "keys"; - - /** + * The key for the unique identifier of the request. + */ public static final String REQUEST_ID = "requestId"; + /** + * Argument name that allows definition of the number of iterations each {@link ResponseMessage} should contain - + * overrides the @{code resultIterationBatchSize} server setting. + */ public static final String ARGS_BATCH_SIZE = "batchSize"; + + /** + * Argument name that allows to provide a map of key/value pairs to apply as variables in the context of + * the Gremlin request sent to the server. + */ public static final String ARGS_BINDINGS = "bindings"; + + /** + * Argument name that allows definition of alias names for {@link Graph} and {@link TraversalSource} objects on + * the remote system. + */ public static final String ARGS_ALIASES = "aliases"; public static final String ARGS_FORCE = "force"; + + /** + * Argument name that corresponds to the Gremlin to evaluate. + */ public static final String ARGS_GREMLIN = "gremlin"; + + /** + * Argument name that allows definition of the flavor of Gremlin used (e.g. gremlin-groovy) to process the request. + */ public static final String ARGS_LANGUAGE = "language"; + + /** - * @deprecated As of release 3.3.9, replaced by {@link #ARGS_EVAL_TIMEOUT}. - */ - @Deprecated - public static final String ARGS_SCRIPT_EVAL_TIMEOUT = "scriptEvaluationTimeout"; - - /** + * Argument name that allows the override of the server setting that determines the maximum time to wait for a + * request to execute on the server. + */ public static final String ARGS_EVAL_TIMEOUT = "evaluationTimeout"; public static final String ARGS_HOST = "host"; public static final String ARGS_SESSION = "session"; 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"; - - /** + * A value that is a custom string that the user can pass to a server that might accept it for purpose of + * identifying the kind of client it came from. + */ 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"; public static final String STATUS_ATTRIBUTE_EXCEPTIONS = "exceptions";
