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 2024/11/15 21:53:36 UTC

(tinkerpop) branch gvalue updated (682cb4b050 -> e1b8059d02)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


 discard 682cb4b050 wip - refactoring, tests, comments
 discard ed1ad59c65 wip - moved all the params out of admin interfaces - not working
 discard d27f15bee0 wip - removed admin interface methods - doesn't work nice
 discard 441edc186a wip - added consistent getter naming
 discard 3a2034a033 wip - added param to has(string, string, object)
 discard 85cd6a9eca wip - fixup after rebase
 discard 050f59c2bb wip - refactoring to use GValue static methods for instanceOf checks
 discard 7b496ca70c wip - translator fix for .NET
 discard 6da219f2ed wip - fixed hasLabel(String, String...) for params
 discard c6228f9859 wip - fixed .NET translator for conjoin
 discard 7323e8ccd1 wip - add values getter on inject
 discard c13a3646e5 wip - refactoring around mu steps
 discard a7cb7c629c wip - hasLabel(String, String...) fixes, more GValue utility
 discard c489ea35f4 wip
 discard 7da00f720a wip
 discard 5235050786 wip
 discard c33151aea6 Get rid of P as a parameter in gherkin
 discard 39c31aa131 wip - params
     add b37e35cf47 TINKERPOP-3083 Change SplitGlobalStep and SplitLocalStep to use a new StringUtil.split utility method which will split the given string into a list of individual string characters if the given separator is an empty string. (#2741)
     add c8ab132512 [TINKERPOP-3080] AggregateGlobalStep acceps all pre-defined Operators (#2616)
     add 37d0cc1597 CTR regenerate feature test files
     add fd040c94a6 Merge branch '3.7-dev'
     add 2891e774f4 Bump BenchmarkDotNet from 0.13.12 to 0.14.0 in /gremlin-dotnet
     add 0c2d2e4a8e Bump gherkin from 28.0.0 to 29.0.0 in /gremlin-dotnet
     add aaddaea14a Merge branch 'dependabot/nuget/gremlin-dotnet/3.6-dev/gherkin-29.0.0' into 3.6-dev
     add 9bcf04219d Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.0 in /gremlin-dotnet
     add c664620883 Merge branch 'dependabot/nuget/gremlin-dotnet/3.6-dev/Microsoft.NET.Test.Sdk-17.11.0' into 3.6-dev
     add 2e27370881 Merge branch '3.6-dev' into 3.7-dev
     add eec15c5c05 Merge branch '3.7-dev'
     add 223a82f8f0 Bump @types/node from 20.14.2 to 22.5.1 in /gremlint (#2748)
     add 1fa63a4513 Bump idna from 3.6 to 3.8 in /gremlin-python/src/main/python (#2746)
     add fe37370746 Bump grunt-cli (#2715)
     add c48706a472 Bump mocha in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2714)
     add ba2cdc2fb1 Bump golang.org/x/text from 0.16.0 to 0.17.0 in /gremlin-go (#2709)
     add 36e1d1fd81 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2675)
     add 0cb8398400 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2655)
     add 0bf5fb168a Merge branch '3.6-dev' into 3.7-dev
     add a6ba1d97c3 Merge branch '3.7-dev'
     add a67d87db33 Fixed changelog formatting CTR
     add e49856e23c Merge branch '3.7-dev'
     add 0f51caabf7 Add String IdManager (#2743)
     add a5a28f82f6 Merge branch '3.7-dev'
     add 69c440fccf [TINKERPOP-3110] Fix Bytecode build logic for strategies (#2757)
     add d4b4486b76 Merge branch '3.7-dev'
     add 2a6ca98a2f [TINKERPOP-3105] Running 3.6.x python-driver with 3.7.x server leads to deserialization errors (#2742)
     add add365b6e0 Merge branch '3.7-dev'
     add a99b58cc48 CTR fix serializer test failures from merging
     add 9d9eb90e97 CTR fix tag/feature names for gherkin feature files
     add b4d62b2020 Merge branch '3.7-dev'
     add 6c8f7ffca7 Bumped to ANTLR 4.13.2
     add 38b7a6b872 Merge branch '3.7-dev'
     add 73fe63bb51 Reverted antlr upgrade - doens't support builds on JDK8 after 4.9
     add b7c9ddda16 Merge branch '3.7-dev'
     add 2f54a5413f Added way to check if the specified label was user defined CTR
     add dd41ffbe6b Merge branch '3.7-dev'
     add 7cafdb95c7 CTR Upgrade gremlin-go to go 1.22
     add 21d70b256a Bump @types/node from 22.5.1 to 22.7.4 in /gremlint (#2804)
     add 8b53ea6bc5 Bump yarl from 1.9.4 to 1.13.1 in /gremlin-python/src/main/python (#2801)
     add 8e3f2fea87 Bump idna from 3.8 to 3.10 in /gremlin-python/src/main/python (#2778)
     add 5153959a66 Bump golang.org/x/text from 0.17.0 to 0.18.0 in /gremlin-go (#2760)
     add 82c375aac5 Bump chai in /gremlin-javascript/src/main/javascript/gremlin-javascript (#2750)
     add ab6297a7c8 Bump github.com/gorilla/websocket from 1.5.2 to 1.5.3 in /gremlin-go (#2653)
     add 403b12af89 Merge branch '3.6-dev' into 3.7-dev
     add 0a63d135e9 Merge branch '3.7-dev'
     add 9c394637e8 CTR TINKERPOP-3050-3053 Minor version bumps for vulnerable dependencies
     add 261e1f40a4 CTR Update rat ignore list and JS mvn clean config
     add b0d5801c92 Bump eslint-plugin-prettier (#2751)
     add 6b023164f8 Bump golang.org/x/text from 0.18.0 to 0.19.0 in /gremlin-go (#2809)
     add b6bdbdd7a1 Merge branch '3.6-dev' into 3.7-dev
     add e289985cdf CTR Bump groovy to 4.0.23
     add 76190de108 CTR CHANGELOG updates
     add acb265fb9e Merge branch '3.6-dev' into 3.7-dev
     add a6777d0c83 Merge branch '3.7-dev'
     add cbf7d9da0f [TINKERPOP-3112] Javascript: fix memory leak on server error (#2807)
     add 551ef620a8 Bump Microsoft.Extensions.Configuration.Json and System.Text.Json (#2813)
     add d2fe846029 Merge branch '3.6-dev' into 3.7-dev
     add 40975e63b7 CTR Minor fixes on merge to 3.7
     add 537e1cc745 Merge branch '3.7-dev'
     add d12d34464a Provided mechanism to allow customization of error messager assertions in gherkin feature tests CTR
     add f53903b02b Merge branch '3.7-dev'
     add e554aa95ca Bump System.Text.Json from 8.0.4 to 8.0.5 in /gremlin-dotnet (#2822)
     add 186c691d1b [TINKERPOP-3086] Upgrade Python Version to >=3.9 (#2808)
     add 0f89417193 Merge branch '3.6-dev' into 3.7-dev
     add acd118134e Merge branch '3.7-dev'
     add 6c43815561 TINKERPOP-3088 Retain lower common type for sum() global
     add f8f791018d Merge pull request #2827 from apache/TINKERPOP-3088
     add 443046c2f0 Bump gh-pages from 6.1.1 to 6.2.0 in /docs/gremlint (#2825)
     add e59665d87c Bump @types/node from 20.14.2 to 22.7.5 in /docs/gremlint (#2815)
     add 8bb5ddffa9 Bump @testing-library/jest-dom from 6.4.2 to 6.5.0 in /docs/gremlint (#2745)
     add 4869c95b13 TINKERPOP-3102 Prevent cardinality with any step besides mergeV
     add 23247e8421 Merge branch '3.7-dev'
     add 67a0d2769f CTR TINKERPOP-3077 Javascript translator incorrectly handle quotes, null and undefined values
     add 9eee4f1817 Merge branch '3.6-dev' into 3.7-dev
     add aefddd68e5 Merge branch '3.7-dev'
     add e81d9abeaf CTR fix js translator tests after merge
     add a5bf4a3ce4 Allowed providers to handle error message assertion for gherkin.
     add a0050ab9ea Merge branch '3.7-dev'
     add fd529c6f50 CTR Fix python headers cannot accept list
     add 2f756b6268 Bump github.com/nicksnyder/go-i18n/v2 from 2.4.0 to 2.4.1 in /gremlin-go (#2828)
     add 47e6625f47 Bump Polly from 8.4.1 to 8.4.2 in /gremlin-dotnet (#2796)
     add c8c425bc40 Bump xunit from 2.9.0 to 2.9.2 in /gremlin-dotnet (#2795)
     add 9f6e975799 CTR Fix python headers cannot accept list
     add f92e04f2a7 Bump github.com/nicksnyder/go-i18n/v2 from 2.4.0 to 2.4.1 in /gremlin-go (#2828)
     add 3dc30568cb Bump Polly from 8.4.1 to 8.4.2 in /gremlin-dotnet (#2796)
     add 478b8a3bc9 Bump xunit from 2.9.0 to 2.9.2 in /gremlin-dotnet (#2795)
     add b882e6d18c Merge branch '3.7-dev'
     add a8b14616fb Update Future docs for TinkerPop 4 (#2598)
     add 3106c4b605 CTR Fix python headers cannot accept list
     add a2e5a6ff36 Bump github.com/nicksnyder/go-i18n/v2 from 2.4.0 to 2.4.1 in /gremlin-go (#2828)
     add 94a468f5af Bump Polly from 8.4.1 to 8.4.2 in /gremlin-dotnet (#2796)
     add 2bb3ae870e Bump xunit from 2.9.0 to 2.9.2 in /gremlin-dotnet (#2795)
     add 68e3eff387 [TINKERPOP-3076] Throw better error if request exceeds WriteBufferSize in Go (#2834)
     add 394162eceb Bump Microsoft.NET.Test.Sdk from 17.11.0 to 17.11.1 in /gremlin-dotnet (#2764)
     add e2ab44a0a4 Bump Microsoft.Extensions.Logging.Abstractions in /gremlin-dotnet (#2814)
     add ca5414fcb7 [TINKERPOP 2700] Make WS Compression Configurable in All GLVs (#2832)
     add 833e2d7c8f Merge branch '3.6-dev' into 3.7-dev
     add 944eae0c25 [TINKERPOP 2700] Make WS Compression Configurable in Remaining GLVs 3.7 (#2833)
     add 342e9e717d Merge branch '3.7-dev'
     add 31aca5d0d8 formatting changes for upgrade docs CTR
     add 62fb6d6ee6 Merge branch '3.7-dev'
     add a87ebf2d52 fix flaky tests in ParametersTest (#2820)
     add 5542869537 TINKERPOP-2085 Remove dependency on mono for docfx (#2840)
     add 2d6814a123 fix flaky tests in ParametersTest (#2820)
     add 52f36f5cbc Merge branch '3.6-dev' into 3.7-dev
     add fbe7bd8ea1 Merge branch '3.7-dev'
     add 0c34840879 Prevented asDate from working on decimal numbers. CTR
     add 49829884a5 Merge branch '3.7-dev'
     add 43958dc000 CTR Update NOTICE
     add 8d3117e427 Merge branch '3.7-dev'
     add 8518f750fd fix(gremlinpython): add async_timeout to runtime deps (#2844)
     add be8eb0274d Merge branch '3.6-dev' into 3.7-dev
     add 0c67e69057 Merge branch '3.7-dev'
     add 71053f3bac TinkerPop 3.6.8 release
     add 18d60c4872 Merge branch '3.6-dev' into 3.7-dev
     add a7012c6ab2 CTR docs fixes
     add 148afd2ed0 Merge branch '3.7-dev'
     add 077e3eb22c TinkerPop 3.7.3 release
     add cb366cd86f CTR fix python deployment and docs update
     add b1f27b9e0d Merge branch '3.6-dev' into 3.7-dev
     add 7843e708df Merge branch '3.7-dev'
     add 18046b69b2 CTR Update Site for 3.6.8/3.7.3 releases
     add 77c77e03c6 Update to 3.7.4-SNAPSHOT CTR
     add c31430e9f5 Added tests for inject() grammar parsing CTR
     add 5eb0205a7d Moved sack() steps definitely singular for step arity CTR
     add 8c78021dea Merge branch '3.7-dev'
     add 02b8a8cc30 Enabled sack()/BigInteger/BigDecimal tests CTR
     add aa327ace6f chore(gremlinpython): remove async_timeout for python 3.11 and newer (#2851)
     add c3064a72b2 Add log entry in WsAndHttpChannelizerHandler (#2855)
     add c2a04407a1 Merge branch '3.7-dev'
     add 6fccb0df48 Revert "Merge branch '3.7-dev'"
     add a06ac45626 Revert "Merge branch '3.7-dev'"
     add 14ce65f208 Revert "Merge branch '3.7-dev'"
     add 26cdee14da Revert "Merge branch '3.7-dev'"
     add 4955947ffe Revert "Parallel Authentication Fix (#2551)"
     add 0828b9d7b4 Add chunked transfer encoding to HTTP Channelizer.
     add acf1d551a9 Remove the UnifiedChannelizer/UnifiedHandler and associated classes.
     add 947ba1a846 draft for GraphSON4 and GraphBinary streaming draft (#2531)
     add f2b845095b Add HTTP request checker and return error for non-POST requests
     add 9e9d2a7d5e requestmessage serde with graphson/graphbinary
     add f72acf71ae Fixes for g when not present, test issues, incorrect streaming.
     add 6518617717 streaming untyped graphson (#2535)
     add 30b4a1bbee Remove the OpProcessors and related classes.
     add b2a2015ecb Remove WebSockets from the server.
     add 8940192900 HttpGremlinEndpointHandler cleanup (#2540)
     add e485b0f228 Minimal changes to get gremlin-driver working with integration tests (#2543)
     add 9e7711f58c Split HTTP endpoint into several handlers and update to use RequestMessageV4 (#2550)
     add fb650f6267 draft java driver (#2557)
     add 57e3a729f0 update response format (#2564)
     add 5a339c2bc8 Introduce Netty handler for managing request IDs.
     add 752749c13e Add back evaluationTimeout and materializeProperties
     add e971d8eb49 Remove RequestId from RequestMessageV4 CTR
     add bd0d1c1688 Renamed "evaluationTimeout" to "timeoutMs" in RequestMessageV4.
     add ab62fd7cb9 http error handling (#2570)
     add 9e79ef0121 ResponseStatusCode removal (#2572)
     add 1bde8474b8 fix some tests (#2574)
     add dfccae7c4b requestId removal (#2575)
     add 0d55689129 Create MessageSerializerV4s and remove MessageSerializer. (#2576)
     add 0fea708c9b Update IO tests to test MessageSerializerV4. (#2586)
     add e5a4a40e44 Minor cleanup of items related to HTTP CTR.
     add 1dca72c481 Remove user agent from HTTP request body.
     add 410cbbc8c8 Replace message in trailers with exception CTR.
     add d993d66c1a Remove CHUNKING_NOT_SUPPORTED state CTR.
     add b50a8be4fa Revert GraphManager changes added in TINKERPOP-2806 CTR.
     add 2703523a39 Change GraphSONv4 response to have message and exception for error responses only CTR
     add c8501a5a30 connection pooling (#2582)
     add 766c86a7db driver error handling (#2594)
     add 96b4c9b13b Replace ResponseResult with ResponseResultV4. (#2595)
     add 22e8d86291 Remove RequestId from RequestMessageV4 CTR.
     add 0659cf5007 Fix incorrect ResponseMessage in TextPlainMessageSerializerV4Test CTR
     add 0dcbb791c7 sigv4 auth client implementation (#2601)
     add 31d7703f8c remove debugging info from client CTR
     add a248f51c62 cleanup
     add 0eecae5443 rename tokens CTR
     add d07531cc28 rework remote console (#2611)
     add fcee57bcb1 remove ConnectionHelper CTR
     add bda0651d0f Re-enable certain tests and add fixes. (#2621)
     add c450f2ad51 Fix gremlin-util tests CTR.
     add 0a0fa481bc Re-enable and fix shouldBlowTheWorkQueueSize test CTR.
     add 03af022dc7 Check for server pipelining CTR.
     add b5de92d1b9 Prevent Java driver channel from being reused too early CTR.
     add a1524baf02 Update console test to use line separator CTR
     add 5a01c06654 Updated tests that depended on PARTIAL_CONTENT status CTR
     add 074ca00b84 Bytecode removal from Java GLV (#2648)
     add 4e37d292ae Fix GremlinLang clone.
     add d471a563b0 fix tests after merge CTR
     add bf7fc93f87 cleanup CTR
     add 652e98395f Python driver basic connectivity to HTTP server (#2657)
     add cc409dc7e3 Bytecode removal from server (#2661)
     add 1a0b50334d Add support for HTTP content compression.
     add acd4defdd3 Small updates after master rebase CTR.
     add 2f1c99c7b1 Add support for HTTP chunked transfer in gremlin-python (#2686)
     add 12cc3c830a cleanup for ResponseMessageV4 (#2698)
     add e9f1c6ee5c Added Set handling to GremlinLang (#2705)
     add 8aad0bc72a Bytecode removal in gremlin-python (#2702)
     add 8dd090c7db Remove v4 suffix CTR
     add 6d537134e4 implement pluggable auth in python with basic and sigv4 as reference (#2731)
     add 580346aa6e update tests in docker and enable feature tests in gremlin-python over HTTP (#2756)
     add 1b2e543c5f Update io Model to reflect v4 serialization types (#2758)
     add 53e929b698 Fix console integration tests (#2759)
     add 469172b5b7 CTR Disable github actions for Go, JS, and .Net
     add 49c653b46d Java driver - renamed maxContentLength to maxResponseContentLength, changed int to long to allow for higher max value, increased default value to Integer.MAX_VALUE as the size check is now done against the total response size instead of previous web socket frame size, and changed zero to be acceptable value which disables the response size check. Gremlin server - renamed maxContentLength to maxRequestContentLength and updated documentation for clarity. (#2749)
     add 181905cb53 Fixed failing GremlinServerSslIntegrateTest.shouldEnableSslAndFailIfCiphersDontMatch by reinstating the previous WebSocket channelizer logic that waited for the handshake to complete after the channel connects. If the handshake fails then a ConnectionException is thrown. (#2753)
     add 2cdfbb0ddd Update IO documentation for V4 serializers. (#2769)
     add 9e8126de1c Update GraphSON IO documentation with updated label, updated type prefix, empty properties and edge properties.
     add 62c473d076 Add v4 versions of GraphSON serializers CTR
     add c62d2c5428 Updates to Strategy Construction for TP4 (#2781)
     add a455b3236a Custom Strategy Construction (#2806)
     add fe9909b078 Revert change to code value in GraphSONv4 CTR.
     add 6a1d9cc941 Merge pull request #2790
     add 4ebd6f60e5 Make properties optional in GraphSONv4 again CTR
     add b9a23d6808 CTR Fix ignores for SeedStrategy feature tests
     add 0549a0ac01 Update `DateTime` serializer according to GraphBinaryV4 IO specs  (#2776)
     add 2b9dc4dfbd Update serializers for `label` as a singleton list of string according to GraphBinaryV4 IO spec. (#2780)
     add a521e94e88 Added ordered `value_flag` `0x02` to Map serializers in Java and Python drivers according to GraphBinaryV4 IO spec. (#2779)
     add c9825d7283 Fix typename for datetime in GraphSON example CTR
     add 99f39e2975 Fix NullPointerException being thrown by outbound encoder. (#2800)
     add 39e50e8733 CTR Fix Python Translator for withoutStrategies()
     add dfb2428204 Update response message serialization with `{bulked}` flag to indicate bulked result data (#2826)
     add d87bf303c5 Updated BulkSet and List serializers in Java and Python to implement list `bulk` flag in GraphBinaryV4 IO spec (#2821)
     add 9582aa673c Add data list back to result object in GraphSONv4.
     add 6b72e98652 Update GraphSONv4 format for edge's vertex reference.
     add 698c563403 Update RequestInterceptor to better work with HTTP. (#2799)
     add 0523392d51 Temporarily disable remote tx from Java driver CTR
     add dfaccc7b33 Update g:DateTime definition in GraphSONv4 documentation CTR.
     add ae76c17e1e Rename GraphSONv4 g:OffsetDateTime to g:DateTime CTR
     add 55f7e180c9 Re-enable GraphSON message serializer for debugging. (#2836)
     add 22e94ac224 Update GraphSONv4 RequestMessage documentation CTR
     add 2d73a08546 enable basic GraphSONV4 connectivity in python
     add f7b4f56768 Added request interceptor to gremlin-python. (#2849)
     add b856745e7b Update BulkSet GraphSONv4 serialization. (#2861)
     add 191849d7e2 Remove Traverser serializers for GraphSON/GraphBinary V4 (#2862)
     add 5cea695c45 Re-enable feature test of GraphSONv4 CTR
     add 7b3caefcf0 Update GraphSONV4 extended types, element, and datetime in gremlin-python (#2854)
     add 68c3bd02d6 Changed connection pooling to reflect having switched from long lived web socket connections to short lived http connections: (#2860)
     add 6ddd11431b Remove unsupported types in GraphSONv4 from core. (#2874)
     add 774ef0e076 Add signal that bytes were read in HttpGremlinResponseDecoder CTR
     add 6c7a31fd6d change from streaming deserialization to aggregating data and make graphson class naming consistent (#2873)
     add c3e29aad63 update bigdecimal in statics to be consistent with server definition (#2875)
     add 0d1635b194 CTR remove unsupported types in GraphSONv4 in gremlin-python
     add 048ec39e3b Make gremlin-python feature tests use gremlin-lang
     add 1a3914acc8 Undo CHANGELOG reverts and small comment changes CTR
     add d0533aec2d Merge pull request #2880
     add cfd68897ea Updated SigV4 interceptor to use the latest version of software.amazon.awssdk and removed old dependency on aws-java-sdk-core. Since latest version of SignedRequest has headers that support multiple values for the same header via Map<String,List> I added validation checks that the expected signed headers only have 1 value. Removed jackson dependency from gremlin-console as it is no longer needed.
     add 666233674b Update SigV4 interceptor to use latest aws sdk version (#2884)
     add 43b06ac3cb Made types in sack() tests explicit.
     add 06b2322656 Merge branch '3.7-dev'
     add 5f739335f4 Update Docs CTR
     add 248c8567b0 Merge branch '3.7-dev'
     add 1e874c8bbd CTR Update dependabot and PR template to reflect 3.6-dev inactivity
     add 53270ca426 RepeatEndStep has the same treatment as EndStep under ComputerAwareStep in IdentityRemovalStrategy (#2879)
     add 8e04fbaeee Merge branch '3.7-dev'
     add 33fe594530 CTR feature test file updates in .net and go
     add cd6bcee936 CTR minor update in gremlin-python error handling and test setup
     add 11f6702919 CTR remove examples and add warning to unsupported GLVs and transactions
     add 142ce3290d CTR update gremlin-python documentation
     add 0ebd920f37 Test reorganization, more tests for select and remove ordering enforcement CTR
     add ad230ba83c Merge branch '3.7-dev'
     add 04fc3940e8 Minor adjustment to test semantics for select() CTR
     add 842f452642 Merge branch '3.7-dev'
     add f47e64f75a Change parameter name for features tests
     add bf1656f31b Merge pull request #2888 from apache/fix-structure-array-tests
     add 81ed3c94d6 Merge branch '3.7-dev'
     add e6104ad277 CTR disable unimplemented GLVs in maven build
     add 6f770d5685 Stopped grammar from parsing child traversals spawned from g
     add b5f9cf06e4 Merge branch '3.7-dev'
     new bb545cd448 wip - params
     new ef612699b3 Get rid of P as a parameter in gherkin
     new 0cb9384ba2 wip
     new 41c2c36cf3 wip
     new 211855134c wip
     new 19c5552dc6 wip - hasLabel(String, String...) fixes, more GValue utility
     new d9fe670346 wip - refactoring around mu steps
     new 96434deab7 wip - add values getter on inject
     new e3a2663a97 wip - fixed .NET translator for conjoin
     new d9ace402d3 wip - fixed hasLabel(String, String...) for params
     new a97b66edc2 wip - translator fix for .NET
     new c83e12b131 wip - refactoring to use GValue static methods for instanceOf checks
     new e329a7bcc3 wip - fixup after rebase
     new db7865ae8f wip - added param to has(string, string, object)
     new 84246d730c wip - added consistent getter naming
     new c9e6744b72 wip - removed admin interface methods - doesn't work nice
     new 93be41da5c wip - moved all the params out of admin interfaces - not working
     new b990a4abe6 wip - refactoring, tests, comments
     new 05ea46fa44 wip
     new e1b8059d02 Fixes after rebase

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (682cb4b050)
            \
             N -- N -- N   refs/heads/gvalue (e1b8059d02)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/dependabot.yml                             |    14 +-
 .github/pull_request_template.md                   |     3 +-
 .github/workflows/build-test.yml                   |   216 +-
 CHANGELOG.asciidoc                                 |   120 +-
 docker/gremlin-server/docker-entrypoint.sh         |     9 +-
 .../gremlin-server-integration-krb5.yaml           |     5 +-
 .../gremlin-server-integration-secure.yaml         |    13 +-
 .../gremlin-server/gremlin-server-integration.yaml |    15 +-
 docs/gremlint/package-lock.json                    | 45536 ++++++++-----------
 docs/gremlint/package.json                         |     8 +-
 docs/site/home/community.html                      |     8 +-
 docs/site/home/download.html                       |   108 +-
 docs/site/home/index.html                          |    10 +-
 .../dev/developer/development-environment.asciidoc |     2 +-
 docs/src/dev/developer/for-committers.asciidoc     |     5 +-
 docs/src/dev/developer/release.asciidoc            |     8 +-
 docs/src/dev/future/index.asciidoc                 |   272 +-
 docs/src/dev/io/graphbinary.asciidoc               |   481 +-
 docs/src/dev/io/graphson.asciidoc                  |  7787 +---
 docs/src/dev/provider/gremlin-semantics.asciidoc   |     2 +-
 docs/src/index.asciidoc                            |     2 +-
 docs/src/reference/gremlin-applications.asciidoc   |    76 +-
 docs/src/reference/gremlin-variants.asciidoc       |   148 +-
 docs/src/reference/intro.asciidoc                  |    52 -
 docs/src/reference/the-traversal.asciidoc          |    17 +-
 docs/src/upgrade/release-3.5.x.asciidoc            |     2 +-
 docs/src/upgrade/release-3.6.x.asciidoc            |     9 +-
 docs/src/upgrade/release-3.7.x.asciidoc            |   102 +-
 docs/src/upgrade/release-4.x.x.asciidoc            |   182 +-
 .../process/traversal/dsl/GremlinDslProcessor.java |    16 +-
 .../dsl/SocialPackageTraversalSourceDsl.java       |     2 +-
 gremlin-console/conf/neo4j-standalone.properties   |    24 -
 gremlin-console/conf/remote-graph.properties       |     8 +-
 gremlin-console/conf/remote-objects.yaml           |    37 -
 gremlin-console/conf/remote-secure.yaml            |    11 +-
 gremlin-console/conf/remote-sigv4.yaml             |    31 +
 gremlin-console/conf/remote.yaml                   |     7 +-
 gremlin-console/pom.xml                            |     4 +-
 gremlin-console/src/main/ext/plugins.txt           |     2 +-
 .../tinkerpop/gremlin/console/Console.groovy       |    17 +-
 .../gremlin/console/GremlinGroovysh.groovy         |   133 +-
 .../tinkerpop/gremlin/console/Mediator.groovy      |    41 +-
 .../tinkerpop/gremlin/console/PluggedIn.groovy     |    12 -
 .../console/commands/BytecodeCommand.groovy        |   126 -
 .../gremlin/console/commands/RemoteCommand.groovy  |   136 -
 .../gremlin/console/commands/SubmitCommand.groovy  |    43 -
 .../console/jsr223/GephiRemoteAcceptor.groovy      |   371 -
 .../GephiTraversalVisualizationStrategy.groovy     |   121 -
 .../console/jsr223/DriverGremlinPlugin.java        |    99 -
 .../console/jsr223/DriverRemoteAcceptor.java       |   281 -
 .../gremlin/console/jsr223/GephiGremlinPlugin.java |    42 -
 .../console/jsr223/RemoteGremlinPlugin.java        |    58 +
 ...g.apache.tinkerpop.gremlin.jsr223.GremlinPlugin |     5 +-
 .../console/commands/BytecodeCommand.properties    |    20 -
 .../console/commands/RemoteCommand.properties      |    19 -
 .../console/commands/SubmitCommand.properties      |    19 -
 gremlin-console/src/main/static/NOTICE             |     4 +-
 .../gremlin/console/GremlinGroovyshTest.groovy     |   139 +-
 .../AbstractGremlinServerIntegrationTest.java      |     7 +-
 .../jsr223/DriverRemoteAcceptorIntegrateTest.java  |   181 -
 .../console/jsr223/DriverRemoteAcceptorTest.java   |   136 -
 .../jsr223/GephiRemoteAcceptorIntegrateTest.java   |   178 -
 .../console/jsr223/UtilitiesGremlinPluginTest.java |     4 +-
 gremlin-console/src/test/python/docker/Dockerfile  |     2 +-
 .../src/test/python/tests/test_console.py          |     6 +-
 .../gremlin/console/jsr223/generate.groovy         |     0
 .../console/jsr223/gremlin-server-integration.yaml |    15 +-
 .../gremlin/console/jsr223/remote-graph.properties |    35 +
 .../tinkerpop/gremlin/console/jsr223/remote.yaml   |     2 +-
 .../gremlin/jsr223/BindingsGremlinPlugin.java      |    76 -
 .../tinkerpop/gremlin/jsr223/CoreImports.java      |    31 +-
 .../jsr223/DefaultGremlinScriptEngineManager.java  |     2 +-
 .../gremlin/jsr223/GremlinLangScriptEngine.java    |    24 -
 .../gremlin/jsr223/GremlinScriptEngine.java        |    29 +-
 .../tinkerpop/gremlin/jsr223/JavaTranslator.java   |   383 -
 .../gremlin/jsr223/TranslatorCustomizer.java       |    38 -
 .../gremlin/jsr223/console/ConsoleCustomizer.java  |    37 -
 .../gremlin/jsr223/console/RemoteAcceptor.java     |    83 -
 .../gremlin/jsr223/console/RemoteException.java    |    60 -
 .../gremlin/language/grammar/ArgumentVisitor.java  |     6 +-
 .../language/grammar/GenericLiteralVisitor.java    |     6 +-
 .../language/grammar/GremlinAntlrToJava.java       |     4 +-
 .../language/grammar/NoOpTerminalVisitor.java      |    14 +-
 .../grammar/TerminalMethodToBytecodeVisitor.java   |    20 +-
 .../grammar/TraversalSourceSelfMethodVisitor.java  |    11 +-
 .../translator/DotNetTranslateVisitor.java         |    16 +-
 .../language/translator/GoTranslateVisitor.java    |    11 +-
 .../translator/GroovyTranslateVisitor.java         |   114 +-
 .../language/translator/JavaTranslateVisitor.java  |     9 +-
 .../translator/JavascriptTranslateVisitor.java     |     9 +-
 .../translator/PythonTranslateVisitor.java         |    34 +-
 .../strategy/decoration/VertexProgramStrategy.java |     2 +-
 .../process/remote/EmbeddedRemoteConnection.java   |    18 +-
 .../gremlin/process/remote/RemoteConnection.java   |     6 +-
 .../remote/traversal/AbstractRemoteTraversal.java  |     4 +-
 .../process/remote/traversal/RemoteTraversal.java  |     4 +-
 .../remote/traversal/step/map/RemoteStep.java      |    10 +-
 .../traversal/AnonymousTraversalSource.java        |     2 +-
 .../gremlin/process/traversal/Bindings.java        |    80 -
 .../gremlin/process/traversal/Bytecode.java        |   333 -
 .../gremlin/process/traversal/Failure.java         |     9 +-
 .../gremlin/process/traversal/GraphOp.java         |    24 +-
 .../gremlin/process/traversal/GremlinLang.java     |   544 +
 .../gremlin/process/traversal/Operator.java        |     8 +-
 .../gremlin/process/traversal/Translator.java      |   352 -
 .../gremlin/process/traversal/Traversal.java       |     8 +-
 .../gremlin/process/traversal/TraversalSource.java |    34 +-
 .../process/traversal/TraversalStrategies.java     |    15 +-
 .../traversal/dsl/graph/GraphTraversal.java        |   589 +-
 .../traversal/dsl/graph/GraphTraversalSource.java  |    68 +-
 .../gremlin/process/traversal/dsl/graph/__.java    |    11 +-
 .../traversal/lambda/AbstractLambdaTraversal.java  |     7 +-
 .../lambda/CardinalityValueTraversal.java          |    15 +-
 .../traversal/step/map/AddVertexStartStep.java     |     8 +
 .../process/traversal/step/map/AddVertexStep.java  |    10 +
 .../process/traversal/step/map/AsDateStep.java     |    35 +-
 .../process/traversal/step/map/DateAddStep.java    |    49 +-
 .../process/traversal/step/map/DateDiffStep.java   |    23 +-
 .../traversal/step/map/SplitGlobalStep.java        |     7 +-
 .../process/traversal/step/map/SplitLocalStep.java |    11 +-
 .../process/traversal/step/map/SumGlobalStep.java  |    11 +-
 .../step/sideEffect/AggregateGlobalStep.java       |    19 +-
 .../step/sideEffect/AggregateLocalStep.java        |    15 +-
 .../traversal/strategy/TraversalStrategyProxy.java |    45 +-
 .../strategy/decoration/ElementIdStrategy.java     |    16 +-
 .../strategy/decoration/OptionsStrategy.java       |     2 +-
 .../optimization/IdentityRemovalStrategy.java      |    26 +-
 .../strategy/util/StepOutputArityPredictor.java    |     7 +-
 .../verification/ComputerVerificationStrategy.java |    24 +-
 .../translator/AnonymizingTypeTranslator.java      |   175 -
 .../traversal/translator/DotNetTranslator.java     |   602 -
 .../traversal/translator/GolangTranslator.java     |   391 -
 .../traversal/translator/GroovyTranslator.java     |   471 -
 .../traversal/translator/JavascriptTranslator.java |   409 -
 .../traversal/translator/PythonTranslator.java     |   492 -
 .../process/traversal/util/BytecodeHelper.java     |   437 -
 .../process/traversal/util/DefaultTraversal.java   |    26 +-
 .../process/traversal/util/EmptyTraversal.java     |     6 +-
 .../gremlin/structure/io/binary/DataType.java      |    38 +-
 .../structure/io/binary/GraphBinaryWriter.java     |    18 +
 .../gremlin/structure/io/binary/Marker.java        |    41 +
 .../io/binary/TypeSerializerRegistry.java          |   101 +-
 .../io/binary/types/BindingSerializer.java         |    49 -
 .../io/binary/types/BulkSetSerializer.java         |    11 +-
 .../io/binary/types/ByteCodeSerializer.java        |    90 -
 .../structure/io/binary/types/ClassSerializer.java |    47 -
 .../structure/io/binary/types/DateSerializer.java  |    54 -
 .../io/binary/types/DateTimeSerializer.java        |    56 +
 .../structure/io/binary/types/EdgeSerializer.java  |    23 +-
 .../structure/io/binary/types/EnumSerializer.java  |    10 -
 .../structure/io/binary/types/GraphSerializer.java |    19 +-
 .../io/binary/types/InetAddressSerializer.java     |    56 -
 .../io/binary/types/InstantSerializer.java         |    46 -
 .../io/binary/types/LambdaSerializer.java          |    59 -
 .../structure/io/binary/types/ListSerializer.java  |    25 +
 .../io/binary/types/LocalDateSerializer.java       |    46 -
 .../io/binary/types/LocalDateTimeSerializer.java   |    50 -
 .../io/binary/types/LocalTimeSerializer.java       |    46 -
 .../structure/io/binary/types/MapSerializer.java   |    29 +
 .../io/binary/types/MetricsSerializer.java         |    67 -
 .../io/binary/types/MonthDaySerializer.java        |    46 -
 .../io/binary/types/OffsetDateTimeSerializer.java  |    51 -
 .../io/binary/types/OffsetTimeSerializer.java      |    51 -
 .../io/binary/types/PeriodSerializer.java          |    46 -
 .../io/binary/types/SimpleTypeSerializer.java      |    15 +-
 .../io/binary/types/SingleTypeSerializer.java      |     5 +-
 .../binary/types/TraversalMetricsSerializer.java   |    53 -
 .../binary/types/TraversalStrategySerializer.java  |    68 -
 .../io/binary/types/TraverserSerializer.java       |    51 -
 .../io/binary/types/VertexPropertySerializer.java  |    22 +-
 .../io/binary/types/VertexSerializer.java          |    13 +-
 .../io/binary/types/YearMonthSerializer.java       |    46 -
 .../io/binary/types/ZoneOffsetSerializer.java      |    47 -
 .../io/binary/types/ZonedDateTimeSerializer.java   |    51 -
 .../structure/io/graphson/GraphSONMapper.java      |    28 +-
 .../structure/io/graphson/GraphSONModule.java      |   139 +-
 .../structure/io/graphson/GraphSONReader.java      |     2 +-
 .../io/graphson/GraphSONSerializersV4.java         |   659 +
 .../io/graphson/GraphSONTypeDeserializer.java      |     3 +-
 .../io/graphson/GraphSONTypeResolverBuilder.java   |    12 +-
 .../io/graphson/GraphSONTypeSerializerV4.java      |   178 +
 .../structure/io/graphson/GraphSONVersion.java     |     3 +-
 .../structure/io/graphson/GraphSONXModuleV4.java   |   106 +
 .../io/graphson/JavaTimeSerializersV4.java         |   130 +
 .../io/graphson/JavaUtilSerializersV4.java         |   199 +
 .../io/graphson/TraversalSerializersV2.java        |   136 +-
 .../io/graphson/TraversalSerializersV3.java        |   140 +-
 .../io/graphson/TraversalSerializersV4.java        |   102 +
 .../structure/io/gryo/GryoSerializersV1.java       |    56 -
 .../structure/io/gryo/GryoSerializersV3.java       |    56 -
 .../gremlin/structure/io/gryo/GryoVersion.java     |    29 +-
 .../gremlin/structure/util/StringFactory.java      |     5 -
 .../util/star/StarGraphGraphSONSerializerV4.java   |   165 +
 .../tinkerpop/gremlin/util/DatetimeHelper.java     |    26 +-
 .../tinkerpop/gremlin/util/NumberHelper.java       |    44 +
 .../apache/tinkerpop/gremlin/util/StringUtil.java  |    53 +
 .../jsr223/GremlinLangScriptEngineTest.java        |    68 +-
 .../grammar/GeneralLiteralVisitorTest.java         |    39 +-
 .../grammar/GraphTraversalSourceVisitorTest.java   |     3 +-
 .../language/grammar/GremlinQueryParserTest.java   |    36 +-
 .../grammar/TraversalMethodVisitorTest.java        |     4 +-
 .../language/grammar/TraversalRootVisitorTest.java |     4 +-
 .../TraversalSourceSelfMethodVisitorTest.java      |     6 +-
 .../grammar/TraversalSourceSpawnVisitorTest.java   |     5 +
 .../language/translator/GremlinTranslatorTest.java |    88 +-
 .../remote/EmbeddedRemoteConnectionTest.java       |    47 +
 .../gremlin/process/traversal/BytecodeTest.java    |   209 -
 .../gremlin/process/traversal/GremlinLangTest.java |   167 +
 .../gremlin/process/traversal/OperatorTest.java    |     1 +
 .../gremlin/process/traversal/TraversalTest.java   |     4 +-
 .../dsl/graph/GraphTraversalSourceTest.java        |    32 +
 .../traversal/dsl/graph/GraphTraversalTest.java    |   138 +-
 .../process/traversal/step/map/AsDateStepTest.java |    27 +-
 .../traversal/step/map/DateAddStepTest.java        |    45 +-
 .../traversal/step/map/DateDiffStepTest.java       |    44 +-
 .../traversal/step/map/SplitGlobalStepTest.java    |     2 +-
 .../traversal/step/map/SplitLocalStepTest.java     |     1 +
 .../traversal/step/util/ParametersTest.java        |    30 +-
 .../strategy/TraversalStrategyProxyTest.java       |    64 +
 .../decoration/ConnectiveStrategyTest.java         |     6 +-
 .../decoration/ElementIdStrategyTraverseTest.java  |     9 +-
 .../strategy/decoration/EventStrategyTest.java     |     8 +-
 .../strategy/decoration/PartitionStrategyTest.java |     8 +-
 .../strategy/decoration/SubgraphStrategyTest.java  |    15 +-
 .../decoration/VertexProgramStrategyTest.java      |     6 +-
 .../AdjacentToIncidentStrategyTest.java            |     5 +-
 .../ByModulatorOptimizationStrategyTest.java       |     5 +-
 .../strategy/optimization/CountStrategyTest.java   |     5 +-
 .../optimization/EarlyLimitStrategyTest.java       |     5 +-
 .../optimization/FilterRankingStrategyTest.java    |     5 +-
 .../optimization/IdentityRemovalStrategyTest.java  |     8 +-
 .../IncidentToAdjacentStrategyTest.java            |     5 +-
 .../optimization/InlineFilterStrategyTest.java     |     7 +-
 .../optimization/LazyBarrierStrategyTest.java      |     6 +-
 .../optimization/MatchPredicateStrategyTest.java   |     5 +-
 .../optimization/OrderLimitStrategyTest.java       |     5 +-
 .../optimization/PathProcessorStrategyTest.java    |     7 +-
 .../optimization/PathRetractionStrategyTest.java   |     6 +-
 .../optimization/ProductiveByStrategyTest.java     |     5 +-
 .../optimization/RepeatUnrollStrategyTest.java     |     5 +-
 .../ComputerVerificationStrategyTest.java          |     5 +-
 .../EdgeLabelVerificationStrategyTest.java         |    11 +-
 .../LambdaRestrictionStrategyTest.java             |     5 +-
 .../verification/ReadOnlyStrategyTest.java         |     5 +-
 .../ReservedKeysVerificationStrategyTest.java      |    10 +-
 .../StandardVerificationStrategyTest.java          |     7 +-
 .../translator/AnonymizingTypeTranslatorTest.java  |   136 -
 .../traversal/translator/DotNetTranslatorTest.java |   352 -
 .../traversal/translator/GolangTranslatorTest.java |   142 -
 .../traversal/translator/GroovyTranslatorTest.java |   374 -
 .../translator/JavascriptTranslatorTest.java       |   227 -
 .../ParameterizedGroovyTranslatorTest.java         |   367 -
 .../traversal/translator/PythonTranslatorTest.java |   161 -
 .../process/traversal/util/BytecodeHelperTest.java |   155 -
 .../traversal/util/DefaultTraversalTest.java       |     2 +-
 .../graphson/GraphSONMapperEmbeddedTypeTest.java   |    99 +-
 .../GraphSONMapperPartialEmbeddedTypeTest.java     |    54 +-
 .../structure/io/graphson/GraphSONMapperTest.java  |    46 +-
 .../gremlin/structure/io/gryo/GryoMapperTest.java  |     8 +-
 .../tinkerpop/gremlin/util/DatetimeHelperTest.java |    54 +-
 .../tinkerpop/gremlin/util/NumberHelperTest.java   |    96 +
 .../tinkerpop/gremlin/util/StringUtilTest.java     |    62 +
 gremlin-dotnet/build/generate.groovy               |     1 +
 gremlin-dotnet/src/.config/dotnet-tools.json       |    12 +
 gremlin-dotnet/src/.gitignore                      |     2 -
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj  |     6 +-
 .../IO/GraphBinary/Types/EdgeSerializer.cs         |     3 +-
 .../GraphBinary/Types/VertexPropertySerializer.cs  |     3 +-
 .../IO/GraphBinary/Types/VertexSerializer.cs       |     3 +-
 gremlin-dotnet/src/docfx.json                      |     2 +-
 gremlin-dotnet/src/pom.xml                         |    54 +-
 .../Gremlin.Net.Benchmarks.csproj                  |     2 +-
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |   121 +-
 .../Gremlin.Net.IntegrationTest.csproj             |     8 +-
 .../DriverRemoteConnection/GraphTraversalTests.cs  |    42 +
 .../Gremlin.Net.Template.IntegrationTest.csproj    |     4 +-
 .../Gremlin.Net.UnitTest.csproj                    |     4 +-
 gremlin-dotnet/test/pom.xml                        |     7 +-
 gremlin-driver/pom.xml                             |    23 +
 .../src/main/java/examples/Connections.java        |     9 +-
 .../tinkerpop/gremlin/driver/AuthProperties.java   |    70 -
 .../tinkerpop/gremlin/driver/Channelizer.java      |   224 +-
 .../apache/tinkerpop/gremlin/driver/Client.java    |   535 +-
 .../apache/tinkerpop/gremlin/driver/Cluster.java   |   465 +-
 .../tinkerpop/gremlin/driver/Connection.java       |   132 +-
 .../gremlin/driver/ConnectionFactory.java          |     6 +-
 .../tinkerpop/gremlin/driver/ConnectionPool.java   |   258 +-
 .../apache/tinkerpop/gremlin/driver/Handler.java   |   282 -
 .../gremlin/driver/HandshakeInterceptor.java       |    38 -
 .../org/apache/tinkerpop/gremlin/driver/Host.java  |    23 +-
 .../tinkerpop/gremlin/driver/HttpRequest.java      |   136 +
 .../gremlin/driver/RequestInterceptor.java         |    15 +-
 .../tinkerpop/gremlin/driver/RequestOptions.java   |   103 +-
 .../apache/tinkerpop/gremlin/driver/Result.java    |     2 +-
 .../tinkerpop/gremlin/driver/ResultQueue.java      |    29 +-
 .../apache/tinkerpop/gremlin/driver/ResultSet.java |    19 -
 .../apache/tinkerpop/gremlin/driver/Settings.java  |   183 +-
 .../apache/tinkerpop/gremlin/driver/auth/Auth.java |    56 +
 .../tinkerpop/gremlin/driver/auth/Basic.java       |    44 +
 .../tinkerpop/gremlin/driver/auth/Sigv4.java       |   209 +
 .../driver/exception/ResponseException.java        |    54 +-
 .../driver/handler/GremlinResponseHandler.java     |   135 +
 .../handler/HttpContentDecompressionHandler.java   |   103 +
 .../driver/handler/HttpGremlinRequestEncoder.java  |   108 +-
 .../driver/handler/HttpGremlinResponseDecoder.java |    68 +-
 .../handler/HttpGremlinResponseStreamDecoder.java  |   119 +
 .../driver/handler/IdleConnectionHandler.java      |    49 +
 .../driver/handler/InactiveChannelHandler.java     |    55 +
 .../driver/handler/WebSocketClientHandler.java     |   161 -
 .../handler/WebSocketGremlinRequestEncoder.java    |    65 -
 .../handler/WebSocketGremlinResponseDecoder.java   |    56 -
 .../interceptor/PayloadSerializingInterceptor.java |    73 +
 .../driver/remote/DriverRemoteConnection.java      |    40 +-
 .../driver/remote/DriverRemoteTransaction.java     |   264 +-
 .../driver/remote/DriverRemoteTraversal.java       |     6 +-
 .../gremlin/driver/simple/AbstractClient.java      |    32 +-
 .../gremlin/driver/simple/SimpleClient.java        |     7 +-
 .../gremlin/driver/simple/SimpleHttpClient.java    |   165 +
 .../gremlin/driver/simple/WebSocketClient.java     |   140 -
 .../driver/util/ConfigurationEvaluator.java        |    55 +-
 .../gremlin/driver/util/ProfilingApplication.java  |    21 +-
 .../gremlin/driver/AbstractResultQueueTest.java    |     2 +-
 .../gremlin/driver/ClusterBuilderTest.java         |    20 +-
 .../gremlin/driver/ClusterConfigTest.java          |    32 +-
 .../tinkerpop/gremlin/driver/ClusterTest.java      |   143 +
 .../gremlin/driver/ConnectionPoolTest.java         |    99 +
 .../apache/tinkerpop/gremlin/driver/HostTest.java  |     4 +-
 .../gremlin/driver/RequestMessageTest.java         |    69 -
 .../tinkerpop/gremlin/driver/ResultQueueTest.java  |    10 +-
 .../tinkerpop/gremlin/driver/ResultSetTest.java    |    40 +-
 .../tinkerpop/gremlin/driver/SettingsTest.java     |    30 +-
 .../WebSocketClientBehaviorIntegrateTest.java      |   544 -
 .../tinkerpop/gremlin/driver/auth/Sigv4Test.java   |   127 +
 .../HttpContentDecompressionHandlerTest.java       |   222 +
 .../HttpGremlinResponseStreamDecoderTest.java      |   137 +
 .../driver/handler/IdleConnectionHandlerTest.java  |    57 +
 .../driver/remote/DriverRemoteConnectionTest.java  |    10 +-
 .../tinkerpop/gremlin/util/PerformanceTest.java    |   252 -
 gremlin-go/README.md                               |     2 +-
 gremlin-go/driver/README.md                        |     6 +-
 gremlin-go/driver/connection_test.go               |    37 +
 gremlin-go/driver/cucumber/gremlin.go              |   112 +
 gremlin-go/driver/error_codes.go                   |     3 +
 gremlin-go/driver/gorillaTransporter.go            |     3 +
 gremlin-go/driver/gorillaTransporter_test.go       |    30 +-
 gremlin-go/driver/graphBinary.go                   |    20 +-
 gremlin-go/driver/resources/error-messages/en.json |     4 +-
 gremlin-go/examples/go.mod                         |    11 +-
 gremlin-go/examples/go.sum                         |    27 +-
 gremlin-go/go.mod                                  |     9 +-
 gremlin-go/go.sum                                  |    20 +-
 gremlin-go/pom.xml                                 |     7 +-
 gremlin-groovy/pom.xml                             |     2 +-
 .../ast/RepeatASTTransformationCustomizer.groovy   |     2 +-
 .../ast/VarAsBindingASTTransformation.groovy       |   160 -
 .../gremlin/groovy/engine/GremlinExecutor.java     |    62 +-
 .../groovy/jsr223/GremlinGroovyScriptEngine.java   |    44 -
 .../jsr223/GremlinGroovyScriptEngineTest.java      |   189 +-
 .../jsr223/GroovyTranslatorComputerProvider.java   |    40 -
 .../GroovyTranslatorProcessComputerTest.java       |    32 -
 .../GroovyTranslatorProcessStandardTest.java       |    32 -
 .../groovy/jsr223/GroovyTranslatorProvider.java    |   228 -
 .../ParameterizedGroovyTranslatorProvider.java     |    13 +-
 gremlin-javascript/pom.xml                         |    10 +-
 .../gremlin-javascript/lib/driver/connection.ts    |     1 +
 .../gremlin-javascript/lib/process/translator.ts   |     6 +-
 .../io/binary/internals/EdgeSerializer.js          |     5 +-
 .../binary/internals/VertexPropertySerializer.js   |     4 +-
 .../io/binary/internals/VertexSerializer.js        |     5 +-
 .../gremlin-javascript/package-lock.json           |   434 +-
 .../javascript/gremlin-javascript/package.json     |     4 +-
 .../test/cucumber/feature-steps.js                 |     3 +
 .../gremlin-javascript/test/cucumber/gremlin.js    |   131 +-
 .../test/integration/sasl-authentication-tests.js  |    13 -
 .../test/integration/traversal-test.js             |    32 +-
 .../test/unit/graphbinary/AnySerializer-test.js    |    12 +-
 .../test/unit/graphbinary/EdgeSerializer-test.js   |     6 +-
 .../graphbinary/VertexPropertySerializer-test.js   |     8 +-
 .../test/unit/graphbinary/VertexSerializer-test.js |     6 +-
 .../test/unit/translator-test.js                   |    21 +
 gremlin-language/src/main/antlr4/Gremlin.g4        |     4 +-
 .../src/test/resources/incorrect-traversals.txt    |     4 +-
 gremlin-python/build/generate.groovy               |     6 +-
 gremlin-python/docker-compose.yml                  |    42 +-
 gremlin-python/pom.xml                             |     4 +
 .../src/main/python/examples/requirements.txt      |     4 +-
 .../gremlin_python/driver/aiohttp/transport.py     |   208 +-
 .../src/main/python/gremlin_python/driver/auth.py  |    55 +
 .../main/python/gremlin_python/driver/client.py    |   113 +-
 .../python/gremlin_python/driver/connection.py     |    54 +-
 .../driver/driver_remote_connection.py             |   134 +-
 .../main/python/gremlin_python/driver/protocol.py  |   300 +-
 .../gremlin_python/driver/remote_connection.py     |    12 +-
 .../main/python/gremlin_python/driver/request.py   |     6 +-
 .../main/python/gremlin_python/driver/resultset.py |    16 +-
 .../python/gremlin_python/driver/serializer.py     |   284 +-
 .../gremlin_python/process/graph_traversal.py      |   757 +-
 .../python/gremlin_python/process/strategies.py    |    37 +-
 .../python/gremlin_python/process/translator.py    |   297 -
 .../python/gremlin_python/process/traversal.py     |   538 +-
 .../src/main/python/gremlin_python/statics.py      |    35 +-
 .../main/python/gremlin_python/structure/graph.py  |     4 -
 .../gremlin_python/structure/io/graphbinaryV1.py   |  1160 -
 .../gremlin_python/structure/io/graphbinaryV4.py   |   834 +
 .../gremlin_python/structure/io/graphsonV2d0.py    |   663 -
 .../gremlin_python/structure/io/graphsonV3d0.py    |   783 -
 .../gremlin_python/structure/io/graphsonV4.py      |   579 +
 .../python/gremlin_python/structure/io/util.py     |    38 +
 .../src/main/python/radish/feature_steps.py        |    51 +-
 gremlin-python/src/main/python/radish/gremlin.py   |   163 +-
 gremlin-python/src/main/python/radish/terrain.py   |    16 +-
 gremlin-python/src/main/python/radish/utils.py     |    49 +-
 gremlin-python/src/main/python/setup.py            |    13 +-
 gremlin-python/src/main/python/tests/conftest.py   |   268 +-
 .../src/main/python/tests/driver/test_auth.py      |    66 +
 .../src/main/python/tests/driver/test_client.py    |   261 +-
 .../tests/driver/test_driver_remote_connection.py  |   322 +-
 .../driver/test_driver_remote_connection_http.py   |   235 -
 .../test_driver_remote_connection_threaded.py      |     9 +-
 .../src/main/python/tests/driver/test_protocol.py  |   131 +
 .../main/python/tests/driver/test_serializer.py    |    26 +-
 .../driver/test_web_socket_client_behavior.py      |     7 +
 .../src/main/python/tests/process/test_dsl.py      |    16 +-
 .../main/python/tests/process/test_gremlin_lang.py |   517 +
 .../main/python/tests/process/test_strategies.py   |   148 +-
 .../main/python/tests/process/test_translator.py   |   458 -
 .../main/python/tests/process/test_traversal.py    |   103 +-
 .../src/main/python/tests/structure/io/model.py    |   155 +
 .../tests/structure/io/test_functionalityio.py     |   118 +-
 .../tests/structure/io/test_graphbinaryV1.py       |   238 -
 .../tests/structure/io/test_graphbinaryV4.py       |   237 +
 .../tests/structure/io/test_graphbinaryv4model.py  |   304 +
 .../python/tests/structure/io/test_graphsonV2d0.py |   537 -
 .../python/tests/structure/io/test_graphsonV3d0.py |   555 -
 .../python/tests/structure/io/test_graphsonV4.py   |   448 +
 .../tests/structure/io/test_graphsonv4model.py     |   306 +
 .../src/main/python/tests/test_statics.py          |    18 +
 gremlin-server/conf/gremlin-server-classic.yaml    |     2 +-
 .../conf/gremlin-server-modern-readonly.yaml       |     2 +-
 gremlin-server/conf/gremlin-server-modern.yaml     |    12 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml      |     7 +-
 .../conf/gremlin-server-rest-modern.yaml           |     2 +-
 .../conf/gremlin-server-rest-secure.yaml           |     5 +-
 gremlin-server/conf/gremlin-server-secure.yaml     |     7 +-
 gremlin-server/conf/gremlin-server-spark.yaml      |     7 +-
 .../conf/gremlin-server-transaction.yaml           |     7 +-
 gremlin-server/conf/gremlin-server.yaml            |    13 +-
 .../gremlin/server/AbstractChannelizer.java        |    44 +-
 .../apache/tinkerpop/gremlin/server/Context.java   |   191 +-
 .../tinkerpop/gremlin/server/GraphManager.java     |    31 -
 .../tinkerpop/gremlin/server/GremlinServer.java    |    14 -
 .../tinkerpop/gremlin/server/OpProcessor.java      |    52 -
 .../gremlin/server/ProcessingException.java        |    37 +
 .../apache/tinkerpop/gremlin/server/Settings.java  |    97 +-
 .../gremlin/server/auth/Authenticator.java         |    16 +-
 .../tinkerpop/gremlin/server/authz/Authorizer.java |    23 +-
 .../gremlin/server/channel/HttpChannelizer.java    |    32 +-
 .../gremlin/server/channel/UnifiedChannelizer.java |    86 -
 .../server/channel/WebSocketChannelizer.java       |   151 -
 .../server/channel/WsAndHttpChannelizer.java       |    59 -
 .../gremlin/server/handler/AbstractSession.java    |   863 -
 .../tinkerpop/gremlin/server/handler/Frame.java    |    48 -
 .../handler/GremlinResponseFrameEncoder.java       |   108 -
 .../handler/HttpBasicAuthenticationHandler.java    |    37 +-
 .../handler/HttpBasicAuthorizationHandler.java     |    45 +-
 .../handler/HttpContentCompressionHandler.java     |    89 +
 .../server/handler/HttpGremlinEndpointHandler.java |   721 +-
 .../gremlin/server/handler/HttpHandlerUtil.java    |   298 +-
 .../server/handler/HttpRequestCheckingHandler.java |    58 +
 .../server/handler/HttpRequestIdHandler.java       |    80 +
 .../server/handler/HttpRequestMessageDecoder.java  |   239 +
 .../server/handler/HttpUserAgentHandler.java       |     5 +-
 .../gremlin/server/handler/MultiTaskSession.java   |   316 -
 .../gremlin/server/handler/OpExecutorHandler.java  |    85 -
 .../gremlin/server/handler/OpSelectorHandler.java  |   113 -
 .../SaslAndHttpBasicAuthenticationHandler.java     |    67 -
 .../server/handler/SaslAuthenticationHandler.java  |   227 -
 .../gremlin/server/handler/ServerSerializers.java  |    46 -
 .../tinkerpop/gremlin/server/handler/Session.java  |    84 -
 .../gremlin/server/handler/SessionException.java   |    43 -
 .../gremlin/server/handler/SessionTask.java        |    42 -
 .../gremlin/server/handler/SingleTaskSession.java  |    99 -
 .../tinkerpop/gremlin/server/handler/StateKey.java |    35 +-
 .../gremlin/server/handler/UnifiedHandler.java     |   356 -
 .../handler/WebSocketAuthorizationHandler.java     |   107 -
 .../server/handler/WebSocketHandlerUtil.java       |    39 -
 .../handler/WsAndHttpChannelizerHandler.java       |   107 -
 .../handler/WsGremlinBinaryRequestDecoder.java     |    94 -
 .../handler/WsGremlinCloseRequestDecoder.java      |    92 -
 .../handler/WsGremlinResponseFrameEncoder.java     |    44 -
 .../handler/WsGremlinTextRequestDecoder.java       |    78 -
 .../gremlin/server/handler/WsUserAgentHandler.java |    75 -
 .../gremlin/server/op/AbstractEvalOpProcessor.java |   364 -
 .../gremlin/server/op/AbstractOpProcessor.java     |   341 -
 .../tinkerpop/gremlin/server/op/OpLoader.java      |    89 -
 .../gremlin/server/op/OpProcessorException.java    |    37 -
 .../gremlin/server/op/session/Session.java         |   273 -
 .../server/op/session/SessionOpProcessor.java      |   743 -
 .../server/op/standard/StandardOpProcessor.java    |   163 -
 .../server/op/traversal/TraversalOpProcessor.java  |   479 -
 .../gremlin/server/util/GremlinError.java          |   142 +
 .../server/util/TextPlainMessageSerializer.java    |    69 +-
 ...org.apache.tinkerpop.gremlin.server.OpProcessor |     3 -
 gremlin-server/src/main/static/NOTICE              |     4 +-
 .../driver/ClientConnectionIntegrateTest.java      |   114 +-
 .../driver/remote/AbstractRemoteGraphProvider.java |    31 +-
 .../remote/GraphBinaryGroovyRemoteFeatureTest.java |    51 +
 .../GraphBinaryGroovyRemoteGraphProvider.java      |    30 +
 .../GraphBinaryLangBulkedRemoteFeatureTest.java    |    51 +
 .../remote/GraphBinaryLangRemoteFeatureTest.java   |    51 +
 .../remote/GraphBinaryLangRemoteGraphProvider.java |    30 +
 .../GraphBinaryRemoteComputerFeatureTest.java      |     3 +-
 .../remote/GraphBinaryRemoteFeatureTest.java       |    51 -
 .../GraphBinaryRemoteGraphComputerProvider.java    |     8 +-
 .../remote/GraphBinaryRemoteGraphProvider.java     |    30 -
 .../remote/GraphSONLangRemoteFeatureTest.java      |    51 +
 .../remote/GraphSONRemoteComputerFeatureTest.java  |     3 +-
 .../driver/remote/GraphSONRemoteFeatureTest.java   |    51 -
 .../GraphSONRemoteGraphComputerProvider.java       |   151 -
 .../driver/remote/GraphSONRemoteGraphProvider.java |    30 -
 .../gremlin/driver/remote/RemoteWorld.java         |    60 +-
 .../jsr223/GremlinGroovyScriptTestEngine.java      |    50 +
 .../GremlinGroovyScriptTestEngineFactory.java      |    47 +
 ...BinaryGroovyRemoteGraphProcessStandardTest.java |    33 +
 ...phBinaryLangRemoteGraphProcessStandardTest.java |    33 +
 .../GraphBinaryRemoteGraphProcessStandardTest.java |    33 -
 .../GraphSONRemoteGraphProcessComputerTest.java    |    34 -
 .../GraphSONRemoteGraphProcessStandardTest.java    |    33 -
 .../AbstractGremlinServerIntegrationTest.java      |    27 -
 .../server/ClientWithOptionsIntegrateTest.java     |    12 -
 .../tinkerpop/gremlin/server/ContextTest.java      |   143 +-
 .../gremlin/server/GremlinDriverIntegrateTest.java |   915 +-
 .../server/GremlinResultSetIntegrateTest.java      |    37 +-
 .../server/GremlinServerAuditLogIntegrateTest.java |   117 +-
 .../server/GremlinServerAuthIntegrateTest.java     |   207 +-
 .../server/GremlinServerAuthKrb5IntegrateTest.java |   248 -
 .../server/GremlinServerAuthzIntegrateTest.java    |   294 +-
 .../server/GremlinServerHttpIntegrateTest.java     |   883 +-
 .../gremlin/server/GremlinServerIntegrateTest.java |   734 +-
 .../GremlinServerSerializationIntegrateTest.java   |     8 +-
 .../server/GremlinServerSessionIntegrateTest.java  |   722 -
 ...SessionIntegrateWithUnifiedChannelizerTest.java |    61 -
 .../server/GremlinServerSslIntegrateTest.java      |    47 +-
 .../server/GremlinSessionTxIntegrateTest.java      |   406 -
 .../gremlin/server/HttpDriverIntegrateTest.java    |   555 +-
 .../gremlin/server/TestClientFactory.java          |    19 +-
 .../gremlin/server/authz/AllowListAuthorizer.java  |    71 +-
 .../gremlin/server/authz/AuthorizerTest.java       |   196 +-
 ...tractGremlinServerChannelizerIntegrateTest.java |    58 +-
 .../channel/HttpChannelizerIntegrateTest.java      |     4 +-
 .../channel/UnifiedChannelizerIntegrateTest.java   |    57 -
 .../server/channel/UnifiedTestChannelizer.java     |    48 -
 .../channel/WebSocketChannelizerIntegrateTest.java |    56 -
 .../server/channel/WebSocketTestChannelizer.java   |    48 -
 .../channel/WsAndHttpChannelizerIntegrateTest.java |    58 -
 .../server/channel/WsAndHttpTestChannelizer.java   |    49 -
 .../handler/HttpContentCompressionHandlerTest.java |   208 +
 .../server/handler/HttpHandlerUtilTest.java        |   165 -
 .../server/handler/HttpRequestIdHandlerTest.java   |    82 +
 .../handler/HttpRequestMessageDecoderTest.java     |   339 +
 .../GraphManagerNotificationsTest.java             |    93 -
 .../notifications/ProviderGraphManagerHelper.java  |    77 -
 .../server/op/AbstractEvalOpProcessorTest.java     |    70 -
 .../gremlin/server/op/AbstractOpProcessorTest.java |    54 -
 .../util/TextPlainMessageSerializerTest.java       |    18 +-
 .../io.cucumber.core.backend.ObjectFactory         |     6 +-
 ...erpop.gremlin.jsr223.GremlinScriptEngineFactory |     1 +
 .../src/test/resources/conf/remote-objects.yaml    |     2 +-
 gremlin-server/src/test/resources/logback-test.xml |     6 +-
 .../gremlin/server/gremlin-server-integration.yaml |     7 +-
 .../tinkerpop/gremlin/features/StepDefinition.java |    65 +-
 .../tinkerpop/gremlin/features/TestFiles.java      |     1 -
 .../apache/tinkerpop/gremlin/features/World.java   |    13 +
 .../gremlin/jsr223/BindingsScriptEngineTest.java   |   115 -
 .../jsr223/GremlinEnabledScriptEngineTest.java     |    90 -
 .../gremlin/jsr223/GremlinScriptEngineSuite.java   |     1 -
 .../gremlin/jsr223/MockGremlinScriptEngine.java    |     7 +-
 .../gremlin/process/ProcessComputerSuite.java      |     6 +-
 .../process/ProcessLimitedComputerSuite.java       |    64 -
 .../process/ProcessLimitedStandardSuite.java       |     8 -
 .../gremlin/process/ProcessStandardSuite.java      |     4 -
 .../process/computer/GraphComputerTest.java        |    12 +-
 .../process/traversal/CoreTraversalTest.java       |     6 +-
 .../process/traversal/step/OrderabilityTest.java   |    13 +-
 .../process/traversal/step/branch/RepeatTest.java  |     2 +
 .../process/traversal/step/map/MatchTest.java      |    12 +-
 .../process/traversal/step/map/VertexTest.java     |     2 +
 .../traversal/step/sideEffect/GroupTest.java       |     4 +-
 .../traversal/step/sideEffect/SackTest.java        |    12 +-
 .../strategy/decoration/TranslationStrategy.java   |   154 -
 .../decoration/TranslationStrategyProcessTest.java |    70 -
 .../EarlyLimitStrategyProcessTest.java             |     2 +
 .../tinkerpop/gremlin/structure/PropertyTest.java  |     2 +-
 .../tinkerpop/gremlin/structure/VariablesTest.java |     2 +-
 .../io/graphbinary/GraphBinaryResourceAccess.java  |    22 +
 .../structure/io/graphbinary/edge-property-v4.gbin |   Bin
 .../structure/io/graphbinary/empty-binary-v4.gbin  |   Bin 0 -> 6 bytes
 .../io/graphbinary/empty-bulklist-v4.gbin          |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/empty-list-v4.gbin    |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/empty-map-v4.gbin     |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/empty-path-v4.gbin    |   Bin 0 -> 14 bytes
 .../structure/io/graphbinary/empty-set-v4.gbin     |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/false-boolean-v4.gbin |   Bin 0 -> 3 bytes
 .../io/graphbinary/forever-duration-v4.gbin        |   Bin 0 -> 14 bytes
 .../gremlin/structure/io/graphbinary/id-t-v4.gbin  |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/max-byte-v4.gbin      |   Bin 0 -> 3 bytes
 .../structure/io/graphbinary/max-double-v4.gbin    |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/max-float-v4.gbin     |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/max-int-v4.gbin       |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/max-long-v4.gbin      |   Bin 0 -> 10 bytes
 .../io/graphbinary/max-offsetdatetime-v4.gbin      |   Bin 0 -> 20 bytes
 .../structure/io/graphbinary/max-short-v4.gbin     |   Bin 0 -> 4 bytes
 .../io/graphbinary/meta-vertexproperty-v4.gbin     |   Bin 0 -> 61 bytes
 .../structure/io/graphbinary/min-byte-v4.gbin      |   Bin 0 -> 3 bytes
 .../structure/io/graphbinary/min-double-v4.gbin    |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/min-float-v4.gbin     |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/min-int-v4.gbin       |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/min-long-v4.gbin      |   Bin 0 -> 10 bytes
 .../io/graphbinary/min-offsetdatetime-v4.gbin      |   Bin 0 -> 20 bytes
 .../structure/io/graphbinary/min-short-v4.gbin     |   Bin 0 -> 4 bytes
 .../structure/io/graphbinary/mixed-string-v4.gbin  |   Bin 0 -> 15 bytes
 .../io/graphbinary/multi-byte-char-v4.gbin         |   Bin 0 -> 4 bytes
 .../structure/io/graphbinary/nan-double-v4.gbin    |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/nan-float-v4.gbin     |   Bin 0 -> 6 bytes
 .../io/graphbinary/neg-bigdecimal-v4.gbin          |   Bin 0 -> 25 bytes
 .../io/graphbinary/neg-biginteger-v4.gbin          |   Bin 0 -> 21 bytes
 .../io/graphbinary/neg-inf-double-v4.gbin          |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/neg-inf-float-v4.gbin |   Bin 0 -> 6 bytes
 .../io/graphbinary/neg-max-double-v4.gbin          |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/neg-max-float-v4.gbin |   Bin 0 -> 6 bytes
 .../io/graphbinary/neg-min-double-v4.gbin          |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/neg-min-float-v4.gbin |   Bin 0 -> 6 bytes
 .../io/graphbinary/neg-zero-double-v4.gbin         |   Bin 0 -> 10 bytes
 .../io/graphbinary/neg-zero-float-v4.gbin          |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/nil-uuid-v4.gbin      |   Bin 0 -> 18 bytes
 .../structure/io/graphbinary/no-prop-edge-v4.gbin  |   Bin 0 -> 80 bytes
 .../io/graphbinary/no-prop-vertex-v4.gbin          |   Bin 0 -> 30 bytes
 .../structure/io/graphbinary/null-property-v4.gbin |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/out-direction-v4.gbin |   Bin
 .../io/graphbinary/pos-bigdecimal-v4.gbin          |   Bin 0 -> 25 bytes
 .../io/graphbinary/pos-biginteger-v4.gbin          |   Bin
 .../io/graphbinary/pos-inf-double-v4.gbin          |   Bin 0 -> 10 bytes
 .../structure/io/graphbinary/pos-inf-float-v4.gbin |   Bin 0 -> 6 bytes
 .../structure/io/graphbinary/prop-path-v4.gbin     |   Bin 0 -> 635 bytes
 .../set-cardinality-vertexproperty-v4.gbin         |   Bin 0 -> 78 bytes
 .../io/graphbinary/single-byte-char-v4.gbin        |   Bin 0 -> 3 bytes
 .../io/graphbinary/single-byte-string-v4.gbin      |   Bin 0 -> 9 bytes
 .../io/graphbinary/specified-uuid-v4.gbin          |   Bin
 .../structure/io/graphbinary/str-binary-v4.gbin    |   Bin
 .../structure/io/graphbinary/tinker-graph-v4.gbin  |   Bin 0 -> 2504 bytes
 .../io/graphbinary/traversal-edge-v4.gbin          |   Bin 0 -> 99 bytes
 .../io/graphbinary/traversal-path-v4.gbin          |   Bin 0 -> 126 bytes
 .../io/graphbinary/traversal-tree-v4.gbin          |   Bin 0 -> 176 bytes
 .../io/graphbinary/traversal-vertex-v4.gbin        |   Bin 0 -> 441 bytes
 .../graphbinary/traversal-vertexproperty-v4.gbin   |   Bin 0 -> 45 bytes
 .../structure/io/graphbinary/true-boolean-v4.gbin  |   Bin 0 -> 3 bytes
 .../io/graphbinary/unspecified-null-v4.gbin        |     1 +
 .../structure/io/graphbinary/var-bulklist-v4.gbin  |   Bin 0 -> 43 bytes
 .../structure/io/graphbinary/var-type-list-v4.gbin |   Bin 0 -> 29 bytes
 .../structure/io/graphbinary/var-type-map-v4.gbin  |   Bin 0 -> 99 bytes
 .../structure/io/graphbinary/var-type-set-v4.gbin  |   Bin 0 -> 29 bytes
 .../structure/io/graphbinary/zero-duration-v4.gbin |   Bin 0 -> 14 bytes
 .../io/graphson/edge-property-v4-no-types.json     |     4 +
 .../structure/io/graphson/edge-property-v4.json    |     0
 .../structure/io/graphson/empty-binary-v4.json     |     4 +
 .../structure/io/graphson/empty-bulklist-v4.json   |     4 +
 .../structure/io/graphson/empty-list-v4.json       |     4 +
 .../structure/io/graphson/empty-map-v4.json        |     4 +
 .../structure/io/graphson/empty-path-v4.json       |    13 +
 .../structure/io/graphson/empty-set-v4.json        |     4 +
 .../structure/io/graphson/false-boolean-v4.json    |     1 +
 .../structure/io/graphson/forever-duration-v4.json |     4 +
 .../gremlin/structure/io/graphson/id-t-v4.json     |     4 +
 .../gremlin/structure/io/graphson/max-byte-v4.json |     4 +
 .../structure/io/graphson/max-double-v4.json       |     4 +
 .../structure/io/graphson/max-float-v4.json        |     4 +
 .../gremlin/structure/io/graphson/max-int-v4.json  |     4 +
 .../gremlin/structure/io/graphson/max-long-v4.json |     4 +
 .../io/graphson/max-offsetdatetime-v4.json         |     4 +
 .../structure/io/graphson/max-short-v4.json        |     4 +
 .../io/graphson/meta-vertexproperty-v4.json        |    14 +
 .../gremlin/structure/io/graphson/min-byte-v4.json |     4 +
 .../structure/io/graphson/min-double-v4.json       |     4 +
 .../structure/io/graphson/min-float-v4.json        |     4 +
 .../gremlin/structure/io/graphson/min-int-v4.json  |     4 +
 .../gremlin/structure/io/graphson/min-long-v4.json |     4 +
 .../io/graphson/min-offsetdatetime-v4.json         |     4 +
 .../structure/io/graphson/min-short-v4.json        |     4 +
 .../structure/io/graphson/mixed-string-v4.json     |     1 +
 .../structure/io/graphson/multi-byte-char-v4.json  |     4 +
 .../structure/io/graphson/nan-double-v4.json       |     4 +
 .../structure/io/graphson/nan-float-v4.json        |     4 +
 .../structure/io/graphson/neg-bigdecimal-v4.json   |     4 +
 .../structure/io/graphson/neg-biginteger-v4.json   |     4 +
 .../structure/io/graphson/neg-inf-double-v4.json   |     4 +
 .../structure/io/graphson/neg-inf-float-v4.json    |     4 +
 .../structure/io/graphson/neg-max-double-v4.json   |     4 +
 .../structure/io/graphson/neg-max-float-v4.json    |     4 +
 .../structure/io/graphson/neg-min-double-v4.json   |     4 +
 .../structure/io/graphson/neg-min-float-v4.json    |     4 +
 .../structure/io/graphson/neg-zero-double-v4.json  |     4 +
 .../structure/io/graphson/neg-zero-float-v4.json   |     4 +
 .../gremlin/structure/io/graphson/nil-uuid-v4.json |     4 +
 .../structure/io/graphson/no-prop-edge-v4.json     |    24 +
 .../structure/io/graphson/no-prop-vertex-v4.json   |    10 +
 .../structure/io/graphson/null-property-v4.json    |     7 +
 .../structure/io/graphson/out-direction-v4.json    |     0
 .../structure/io/graphson/pos-bigdecimal-v4.json   |     4 +
 .../structure/io/graphson/pos-biginteger-v4.json   |     4 +
 .../structure/io/graphson/pos-inf-double-v4.json   |     4 +
 .../structure/io/graphson/pos-inf-float-v4.json    |     4 +
 .../structure/io/graphson/prop-path-v4.json        |   165 +
 .../set-cardinality-vertexproperty-v4.json         |    17 +
 .../structure/io/graphson/single-byte-char-v4.json |     4 +
 .../io/graphson/single-byte-string-v4.json         |     1 +
 .../structure/io/graphson/specified-uuid-v4.json   |     0
 .../structure/io/graphson/str-binary-v4.json       |     4 +
 .../structure/io/graphson/tinker-graph-v4.json     |   885 +
 .../io/graphson/traversal-edge-v4-no-types.json    |    16 +
 .../structure/io/graphson/traversal-edge-v4.json   |    36 +
 .../io/graphson/traversal-path-v4-no-types.json    |    16 +
 .../structure/io/graphson/traversal-path-v4.json   |    49 +
 .../structure/io/graphson/traversal-tree-v4.json   |    60 +
 .../io/graphson/traversal-vertex-v4-no-types.json  |    39 +
 .../structure/io/graphson/traversal-vertex-v4.json |   100 +
 .../traversal-vertexproperty-v4-no-types.json      |     5 +
 .../io/graphson/traversal-vertexproperty-v4.json   |    11 +
 .../structure/io/graphson/true-boolean-v4.json     |     1 +
 .../structure/io/graphson/unspecified-null-v4.json |     1 +
 .../structure/io/graphson/var-bulklist-v4.json     |     4 +
 .../structure/io/graphson/var-type-list-v4.json    |     7 +
 .../structure/io/graphson/var-type-map-v4.json     |    25 +
 .../structure/io/graphson/var-type-set-v4.json     |     7 +
 .../structure/io/graphson/zero-duration-v4.json    |     4 +
 .../gremlin/test/features/branch/Optional.feature  |     4 +-
 .../gremlin/test/features/filter/Is.feature        |     2 +-
 .../gremlin/test/features/filter/Range.feature     |    56 +-
 .../integrated/AdjacentToIncidentStrategy.feature  |    80 +
 .../ByModulatorOptimizationStrategy.feature        |    52 +
 .../ComputerFinalizationStrategy.feature           |    52 +
 .../ComputerVerificationStrategy.feature           |    52 +
 .../features/integrated/ConnectiveStrategy.feature |    43 +
 .../test/features/integrated/CountStrategy.feature |    46 +
 .../features/integrated/EarlyLimitStrategy.feature |    46 +
 .../EdgeLabelVerificationStrategy.feature          |    63 +
 .../features/integrated/ElementIdStrategy.feature  |    52 +
 .../integrated/FilterRankingStrategy.feature       |    48 +
 .../integrated/GraphFilterStrategy.feature         |    52 +
 .../integrated/HaltedTraverserStrategy.feature     |    69 +
 .../integrated/IdentityRemovalStrategy.feature     |    52 +
 .../integrated/IncidentToAdjacentStrategy.feature  |    52 +
 .../integrated/InlineFilterStrategy.feature        |    42 +
 .../integrated/LambdaRestrictionStrategy.feature   |    54 +
 .../integrated/LazyBarrierStrategy.feature         |    42 +
 .../integrated/MatchAlgorithmStrategy.feature      |    63 +
 .../integrated/MatchPredicateStrategy.feature      |    49 +
 .../MessagePassingReductionStrategy.feature        |    52 +
 .../features/integrated/OptionsStrategy.feature    |    69 +
 .../features/integrated/OrderLimitStrategy.feature |    52 +
 .../integrated/PathProcessorStrategy.feature       |    53 +
 .../integrated/PathRetractionStrategy.feature      |    52 +
 .../integrated/ProductiveByStrategy.feature        |    42 +
 .../features/integrated/ProfileStrategy.feature    |    52 +
 .../integrated/ReferenceElementStrategy.feature    |    52 +
 .../integrated/RepeatUnrollStrategy.feature        |    44 +
 .../ReservedKeysVerificationStrategy.feature       |    50 +
 .../test/features/integrated/SeedStrategy.feature  |    48 +
 .../StandardVerificationStrategy.feature           |    52 +
 .../VertexProgramRestrictionStrategy.feature       |    63 +
 .../integrated/VertexProgramStrategy.feature       |    52 +
 .../gremlin/test/features/map/AsDate.feature       |     5 +-
 .../gremlin/test/features/map/Call.feature         |     2 +-
 .../gremlin/test/features/map/DateAdd.feature      |     1 +
 .../gremlin/test/features/map/Edge.feature         |   261 +-
 .../gremlin/test/features/map/Element.feature      |     2 +-
 .../gremlin/test/features/map/MergeEdge.feature    |     7 +-
 .../gremlin/test/features/map/MergeVertex.feature  |     8 +
 .../gremlin/test/features/map/Product.feature      |     2 +-
 .../gremlin/test/features/map/Select.feature       |   201 +-
 .../gremlin/test/features/map/Split.feature        |    29 +
 .../gremlin/test/features/map/Sum.feature          |   130 +-
 .../gremlin/test/features/map/Vertex.feature       |   248 +-
 .../test/features/semantics/Comparability.feature  |    24 +-
 .../test/features/semantics/Equality.feature       |     4 +-
 .../test/features/semantics/Orderability.feature   |     4 +-
 .../test/features/sideEffect/Aggregate.feature     |   444 +-
 .../gremlin/test/features/sideEffect/Group.feature |     4 +-
 .../test/features/sideEffect/Inject.feature        |     8 +-
 .../gremlin/test/features/sideEffect/Sack.feature  |    52 +-
 .../test/features/sideEffect/SideEffectCap.feature |     2 +-
 .../gremlin/test/features/sideEffect/Store.feature |     2 +
 .../driver/GraphBinaryReaderWriterBenchmark.java   |    28 +-
 .../gremlin/driver/GraphSONMapperBenchmark.java    |    32 +-
 .../gremlin/driver/SerializationBenchmark.java     |    45 +-
 .../process/TraversalConstructionBenchmark.java    |     6 +-
 .../tinkerpop/jsr223/JavaTranslatorBenchmark.java  |    76 -
 .../gremlin/socket/server/SocketServerRunner.java  |     9 +-
 .../gremlin/socket/server/TestChannelizers.java    |   105 -
 .../socket/server/TestWSGremlinInitializer.java    |   195 -
 .../tinkerpop/gremlin/util/MessageSerializer.java  |    28 +-
 .../org/apache/tinkerpop/gremlin/util/Tokens.java  |    70 +-
 .../gremlin/util/message/RequestMessage.java       |   197 +-
 .../gremlin/util/message/ResponseMessage.java      |   117 +-
 .../gremlin/util/message/ResponseResult.java       |    19 +-
 .../gremlin/util/message/ResponseStatus.java       |    23 +-
 .../gremlin/util/message/ResponseStatusCode.java   |   195 -
 .../ser/AbstractGraphSONMessageSerializerV1.java   |   229 -
 .../ser/AbstractGraphSONMessageSerializerV2.java   |   306 -
 .../ser/AbstractGraphSONMessageSerializerV4.java   |   502 +
 .../util/ser/AbstractMessageSerializer.java        |     2 +-
 .../util/ser/GraphBinaryMessageSerializerV1.java   |   276 -
 .../util/ser/GraphBinaryMessageSerializerV4.java   |   332 +
 .../util/ser/GraphSONMessageSerializerV1.java      |   125 -
 .../util/ser/GraphSONMessageSerializerV2.java      |   136 -
 .../util/ser/GraphSONMessageSerializerV3.java      |   138 -
 .../util/ser/GraphSONMessageSerializerV4.java      |    63 +
 .../ser/GraphSONUntypedMessageSerializerV1.java    |   126 -
 .../ser/GraphSONUntypedMessageSerializerV2.java    |   129 -
 .../ser/GraphSONUntypedMessageSerializerV3.java    |   128 -
 .../ser/GraphSONUntypedMessageSerializerV4.java    |    66 +
 .../gremlin/util/ser/MessageTextSerializer.java    |    42 -
 .../util/ser/RequestMessageGryoSerializer.java     |    57 -
 .../util/ser/ResponseMessageGryoSerializer.java    |    67 -
 .../tinkerpop/gremlin/util/ser/SerTokens.java      |    25 +-
 .../tinkerpop/gremlin/util/ser/Serializers.java    |    56 +-
 .../util/ser/binary/RequestMessageSerializer.java  |    52 +-
 .../util/ser/binary/ResponseMessageSerializer.java |    89 -
 .../structure/io/AbstractCompatibilityTest.java    |    36 +-
 .../io/AbstractTypedCompatibilityTest.java         |   880 +-
 .../io/AbstractUntypedCompatibilityTest.java       |   248 +-
 .../tinkerpop/gremlin/structure/io/Model.java      |   284 +-
 .../graphbinary/GraphBinaryCompatibilityTest.java  |    18 +-
 .../graphson/GraphSONTypedCompatibilityTest.java   |    36 +-
 .../graphson/GraphSONUntypedCompatibilityTest.java |    36 +-
 .../gremlin/util/message/RequestMessageTest.java   |   150 +
 .../util/message/ResponseStatusCodeTest.java       |    36 -
 .../AbstractGraphSONMessageSerializerV1Test.java   |    53 -
 .../AbstractGraphSONMessageSerializerV2Test.java   |    53 -
 .../AbstractGraphSONMessageSerializerV4Test.java   |    52 +
 .../gremlin/util/ser/AbstractRoundTripTest.java    |   124 +-
 .../util/ser/GraphSONMessageSerializerV1Test.java  |   335 -
 .../util/ser/GraphSONMessageSerializerV2Test.java  |   628 -
 .../GraphSONMessageSerializerV3RoundTripTest.java  |    59 -
 .../util/ser/GraphSONMessageSerializerV3Test.java  |   419 -
 .../GraphSONMessageSerializerV4RoundTripTest.java  |    59 +
 .../util/ser/GraphSONMessageSerializerV4Test.java  |   278 +
 .../GraphSONUntypedMessageSerializerV1Test.java    |   512 -
 .../GraphSONUntypedMessageSerializerV2Test.java    |   479 -
 .../GraphSONUntypedMessageSerializerV3Test.java    |   471 -
 .../GraphSONUntypedMessageSerializerV4Test.java    |   166 +
 .../binary/GraphBinaryMessageSerializerV1Test.java |   279 -
 .../binary/GraphBinaryMessageSerializerV4Test.java |   223 +
 .../util/ser/binary/MessageSerializerTest.java     |   153 +
 .../ser/binary/TypeSerializerFailureTests.java     |    11 +-
 .../util/ser/binary/types/sample/SamplePerson.java |     8 +-
 .../types/sample/SamplePersonSerializer.java       |     4 +-
 .../types/sample/SamplePersonSerializerTest.java   |    27 +-
 .../structure/io/graphbinary/barrier-v1.gbin       |   Bin 16 -> 0 bytes
 .../structure/io/graphbinary/bigdecimal-v1.gbin    |   Bin 25 -> 0 bytes
 .../structure/io/graphbinary/binding-v1.gbin       |   Bin 13 -> 0 bytes
 .../structure/io/graphbinary/bulkset-v1.gbin       |   Bin 43 -> 0 bytes
 .../gremlin/structure/io/graphbinary/byte-v1.gbin  |   Bin 3 -> 0 bytes
 .../structure/io/graphbinary/bytecode-v1.gbin      |   Bin 80 -> 0 bytes
 .../structure/io/graphbinary/cardinality-v1.gbin   |   Bin 12 -> 0 bytes
 .../gremlin/structure/io/graphbinary/char-v1.gbin  |   Bin 3 -> 0 bytes
 .../gremlin/structure/io/graphbinary/class-v1.gbin |   Bin 18 -> 0 bytes
 .../structure/io/graphbinary/column-v1.gbin        |   Bin 12 -> 0 bytes
 .../gremlin/structure/io/graphbinary/date-v1.gbin  |   Bin 10 -> 0 bytes
 .../structure/io/graphbinary/double-v1.gbin        |   Bin 10 -> 0 bytes
 .../structure/io/graphbinary/duration-v1.gbin      |   Bin 14 -> 0 bytes
 .../gremlin/structure/io/graphbinary/edge-v1.gbin  |   Bin 81 -> 0 bytes
 .../gremlin/structure/io/graphbinary/float-v1.gbin |   Bin 6 -> 0 bytes
 .../structure/io/graphbinary/inetaddress-v1.gbin   |   Bin 10 -> 0 bytes
 .../structure/io/graphbinary/instant-v1.gbin       |   Bin 14 -> 0 bytes
 .../structure/io/graphbinary/integer-v1.gbin       |   Bin 6 -> 0 bytes
 .../structure/io/graphbinary/lambda-v1.gbin        |   Bin 40 -> 0 bytes
 .../gremlin/structure/io/graphbinary/list-v1.gbin  |   Bin 27 -> 0 bytes
 .../structure/io/graphbinary/localdate-v1.gbin     |   Bin 8 -> 0 bytes
 .../structure/io/graphbinary/localdatetime-v1.gbin |   Bin 16 -> 0 bytes
 .../structure/io/graphbinary/localtime-v1.gbin     |   Bin 10 -> 0 bytes
 .../gremlin/structure/io/graphbinary/long-v1.gbin  |   Bin 10 -> 0 bytes
 .../gremlin/structure/io/graphbinary/map-v1.gbin   |   Bin 75 -> 0 bytes
 .../structure/io/graphbinary/metrics-v1.gbin       |   Bin 307 -> 0 bytes
 .../structure/io/graphbinary/monthday-v1.gbin      |   Bin 4 -> 0 bytes
 .../io/graphbinary/offsetdatetime-v1.gbin          |   Bin 20 -> 0 bytes
 .../structure/io/graphbinary/offsettime-v1.gbin    |   Bin 14 -> 0 bytes
 .../structure/io/graphbinary/operator-v1.gbin      |   Bin 11 -> 0 bytes
 .../gremlin/structure/io/graphbinary/order-v1.gbin |   Bin 15 -> 0 bytes
 .../gremlin/structure/io/graphbinary/p-v1.gbin     |   Bin 18 -> 0 bytes
 .../gremlin/structure/io/graphbinary/pand-v1.gbin  |   Bin 49 -> 0 bytes
 .../gremlin/structure/io/graphbinary/path-v1.gbin  |   Bin 96 -> 0 bytes
 .../structure/io/graphbinary/period-v1.gbin        |   Bin 14 -> 0 bytes
 .../gremlin/structure/io/graphbinary/pick-v1.gbin  |   Bin 11 -> 0 bytes
 .../gremlin/structure/io/graphbinary/pop-v1.gbin   |   Bin 11 -> 0 bytes
 .../gremlin/structure/io/graphbinary/por-v1.gbin   |   Bin 64 -> 0 bytes
 .../structure/io/graphbinary/pwithin-v1.gbin       |   Bin 22 -> 0 bytes
 .../structure/io/graphbinary/pwithout-v1.gbin      |   Bin 29 -> 0 bytes
 .../gremlin/structure/io/graphbinary/scope-v1.gbin |   Bin 13 -> 0 bytes
 .../gremlin/structure/io/graphbinary/set-v1.gbin   |   Bin 27 -> 0 bytes
 .../gremlin/structure/io/graphbinary/short-v1.gbin |   Bin 4 -> 0 bytes
 .../gremlin/structure/io/graphbinary/t-v1.gbin     |   Bin 13 -> 0 bytes
 .../gremlin/structure/io/graphbinary/textp-v1.gbin |   Bin 29 -> 0 bytes
 .../structure/io/graphbinary/timestamp-v1.gbin     |   Bin 10 -> 0 bytes
 .../structure/io/graphbinary/tinkergraph-v1.gbin   |   Bin 2264 -> 0 bytes
 .../io/graphbinary/traversalmetrics-v1.gbin        |   Bin 593 -> 0 bytes
 .../structure/io/graphbinary/traverser-v1.gbin     |   Bin 415 -> 0 bytes
 .../structure/io/graphbinary/vertex-v1.gbin        |   Bin 405 -> 0 bytes
 .../io/graphbinary/vertexproperty-v1.gbin          |   Bin 35 -> 0 bytes
 .../gremlin/structure/io/graphbinary/year-v1.gbin  |   Bin 6 -> 0 bytes
 .../structure/io/graphbinary/yearmonth-v1.gbin     |   Bin 7 -> 0 bytes
 .../structure/io/graphbinary/zoneddatetime-v1.gbin |   Bin 20 -> 0 bytes
 .../structure/io/graphbinary/zoneoffset-v1.gbin    |   Bin 6 -> 0 bytes
 .../authenticationchallenge-v1-no-types.json       |     1 -
 .../authenticationchallenge-v2-no-types.json       |     1 -
 .../io/graphson/authenticationchallenge-v2.json    |    12 -
 .../authenticationchallenge-v3-no-types.json       |     1 -
 .../io/graphson/authenticationchallenge-v3.json    |    18 -
 .../authenticationresponse-v1-no-types.json        |     1 -
 .../authenticationresponse-v2-no-types.json        |     1 -
 .../io/graphson/authenticationresponse-v2.json     |     9 -
 .../authenticationresponse-v3-no-types.json        |     1 -
 .../io/graphson/authenticationresponse-v3.json     |     9 -
 .../gremlin/structure/io/graphson/barrier-v2.json  |     4 -
 .../gremlin/structure/io/graphson/barrier-v3.json  |     4 -
 .../structure/io/graphson/bigdecimal-v2.json       |     4 -
 .../structure/io/graphson/bigdecimal-v3.json       |     4 -
 .../structure/io/graphson/biginteger-v2.json       |     4 -
 .../structure/io/graphson/biginteger-v3.json       |     4 -
 .../gremlin/structure/io/graphson/binding-v2.json  |    10 -
 .../gremlin/structure/io/graphson/binding-v3.json  |    10 -
 .../gremlin/structure/io/graphson/bulkset-v2.json  |     1 -
 .../gremlin/structure/io/graphson/bulkset-v3.json  |    10 -
 .../gremlin/structure/io/graphson/byte-v2.json     |     4 -
 .../gremlin/structure/io/graphson/byte-v3.json     |     4 -
 .../structure/io/graphson/bytebuffer-v2.json       |     4 -
 .../structure/io/graphson/bytebuffer-v3.json       |     4 -
 .../gremlin/structure/io/graphson/bytecode-v2.json |     6 -
 .../gremlin/structure/io/graphson/bytecode-v3.json |     6 -
 .../structure/io/graphson/cardinality-v2.json      |     4 -
 .../structure/io/graphson/cardinality-v3.json      |     4 -
 .../gremlin/structure/io/graphson/char-v2.json     |     4 -
 .../gremlin/structure/io/graphson/char-v3.json     |     4 -
 .../gremlin/structure/io/graphson/class-v2.json    |     4 -
 .../gremlin/structure/io/graphson/class-v3.json    |     4 -
 .../gremlin/structure/io/graphson/column-v2.json   |     4 -
 .../gremlin/structure/io/graphson/column-v3.json   |     4 -
 .../gremlin/structure/io/graphson/date-v2.json     |     4 -
 .../gremlin/structure/io/graphson/date-v3.json     |     4 -
 .../structure/io/graphson/direction-v3.json        |     4 -
 .../gremlin/structure/io/graphson/double-v2.json   |     4 -
 .../gremlin/structure/io/graphson/double-v3.json   |     4 -
 .../gremlin/structure/io/graphson/duration-v2.json |     4 -
 .../gremlin/structure/io/graphson/duration-v3.json |     4 -
 .../structure/io/graphson/edge-v1-no-types.json    |     1 -
 .../structure/io/graphson/edge-v2-no-types.json    |     1 -
 .../gremlin/structure/io/graphson/edge-v2.json     |    32 -
 .../structure/io/graphson/edge-v3-no-types.json    |     1 -
 .../gremlin/structure/io/graphson/edge-v3.json     |    32 -
 .../gremlin/structure/io/graphson/float-v2.json    |     4 -
 .../gremlin/structure/io/graphson/float-v3.json    |     4 -
 .../structure/io/graphson/inetaddress-v2.json      |     4 -
 .../structure/io/graphson/inetaddress-v3.json      |     4 -
 .../gremlin/structure/io/graphson/instant-v2.json  |     4 -
 .../gremlin/structure/io/graphson/instant-v3.json  |     4 -
 .../gremlin/structure/io/graphson/integer-v2.json  |     4 -
 .../gremlin/structure/io/graphson/integer-v3.json  |     4 -
 .../gremlin/structure/io/graphson/lambda-v2.json   |     8 -
 .../gremlin/structure/io/graphson/lambda-v3.json   |     8 -
 .../gremlin/structure/io/graphson/list-v3.json     |     7 -
 .../structure/io/graphson/localdate-v2.json        |     4 -
 .../structure/io/graphson/localdate-v3.json        |     4 -
 .../structure/io/graphson/localdatetime-v2.json    |     4 -
 .../structure/io/graphson/localdatetime-v3.json    |     4 -
 .../structure/io/graphson/localtime-v2.json        |     4 -
 .../structure/io/graphson/localtime-v3.json        |     4 -
 .../gremlin/structure/io/graphson/long-v2.json     |     4 -
 .../gremlin/structure/io/graphson/long-v3.json     |     4 -
 .../gremlin/structure/io/graphson/map-v3.json      |    25 -
 .../gremlin/structure/io/graphson/metrics-v2.json  |    54 -
 .../gremlin/structure/io/graphson/metrics-v3.json  |    52 -
 .../gremlin/structure/io/graphson/monthday-v2.json |     4 -
 .../gremlin/structure/io/graphson/monthday-v3.json |     4 -
 .../structure/io/graphson/offsetdatetime-v2.json   |     4 -
 .../structure/io/graphson/offsetdatetime-v3.json   |     4 -
 .../structure/io/graphson/offsettime-v2.json       |     4 -
 .../structure/io/graphson/offsettime-v3.json       |     4 -
 .../gremlin/structure/io/graphson/operator-v2.json |     4 -
 .../gremlin/structure/io/graphson/operator-v3.json |     4 -
 .../gremlin/structure/io/graphson/order-v2.json    |     4 -
 .../gremlin/structure/io/graphson/order-v3.json    |     4 -
 .../gremlin/structure/io/graphson/p-v2.json        |    10 -
 .../gremlin/structure/io/graphson/p-v3.json        |    10 -
 .../gremlin/structure/io/graphson/pand-v2.json     |    25 -
 .../gremlin/structure/io/graphson/pand-v3.json     |    25 -
 .../structure/io/graphson/path-v1-no-types.json    |     1 -
 .../structure/io/graphson/path-v2-no-types.json    |     1 -
 .../gremlin/structure/io/graphson/path-v2.json     |    34 -
 .../structure/io/graphson/path-v3-no-types.json    |     1 -
 .../gremlin/structure/io/graphson/path-v3.json     |    49 -
 .../gremlin/structure/io/graphson/period-v2.json   |     4 -
 .../gremlin/structure/io/graphson/period-v3.json   |     4 -
 .../gremlin/structure/io/graphson/pick-v2.json     |     4 -
 .../gremlin/structure/io/graphson/pick-v3.json     |     4 -
 .../gremlin/structure/io/graphson/pop-v2.json      |     4 -
 .../gremlin/structure/io/graphson/pop-v3.json      |     4 -
 .../gremlin/structure/io/graphson/por-v2.json      |    31 -
 .../gremlin/structure/io/graphson/por-v3.json      |    34 -
 .../io/graphson/property-v1-no-types.json          |     1 -
 .../io/graphson/property-v2-no-types.json          |     1 -
 .../io/graphson/property-v3-no-types.json          |     1 -
 .../gremlin/structure/io/graphson/property-v3.json |    10 -
 .../gremlin/structure/io/graphson/pwithin-v2.json  |    10 -
 .../gremlin/structure/io/graphson/pwithin-v3.json  |    13 -
 .../gremlin/structure/io/graphson/pwithout-v2.json |    13 -
 .../gremlin/structure/io/graphson/pwithout-v3.json |    16 -
 .../gremlin/structure/io/graphson/scope-v2.json    |     4 -
 .../gremlin/structure/io/graphson/scope-v3.json    |     4 -
 .../io/graphson/sessionclose-v1-no-types.json      |     1 -
 .../io/graphson/sessionclose-v2-no-types.json      |     1 -
 .../structure/io/graphson/sessionclose-v2.json     |     8 -
 .../io/graphson/sessionclose-v3-no-types.json      |     1 -
 .../structure/io/graphson/sessionclose-v3.json     |     9 -
 .../io/graphson/sessioneval-v1-no-types.json       |     1 -
 .../io/graphson/sessioneval-v2-no-types.json       |     1 -
 .../structure/io/graphson/sessioneval-v2.json      |    16 -
 .../io/graphson/sessioneval-v3-no-types.json       |     1 -
 .../structure/io/graphson/sessioneval-v3.json      |    15 -
 .../graphson/sessionevalaliased-v1-no-types.json   |     1 -
 .../graphson/sessionevalaliased-v2-no-types.json   |     1 -
 .../io/graphson/sessionevalaliased-v2.json         |    19 -
 .../graphson/sessionevalaliased-v3-no-types.json   |     1 -
 .../io/graphson/sessionevalaliased-v3.json         |    18 -
 .../io/graphson/sessionlesseval-v1-no-types.json   |     1 -
 .../io/graphson/sessionlesseval-v2-no-types.json   |     1 -
 .../structure/io/graphson/sessionlesseval-v2.json  |    15 -
 .../io/graphson/sessionlesseval-v3-no-types.json   |     1 -
 .../structure/io/graphson/sessionlesseval-v3.json  |    15 -
 .../sessionlessevalaliased-v1-no-types.json        |     1 -
 .../sessionlessevalaliased-v2-no-types.json        |     1 -
 .../io/graphson/sessionlessevalaliased-v2.json     |    18 -
 .../sessionlessevalaliased-v3-no-types.json        |     1 -
 .../io/graphson/sessionlessevalaliased-v3.json     |    18 -
 .../gremlin/structure/io/graphson/set-v3.json      |     7 -
 .../gremlin/structure/io/graphson/short-v2.json    |     4 -
 .../gremlin/structure/io/graphson/short-v3.json    |     4 -
 .../io/graphson/standardresult-v1-no-types.json    |     1 -
 .../io/graphson/standardresult-v2-no-types.json    |     1 -
 .../structure/io/graphson/standardresult-v2.json   |   111 -
 .../io/graphson/standardresult-v3-no-types.json    |     1 -
 .../structure/io/graphson/standardresult-v3.json   |   120 -
 .../gremlin/structure/io/graphson/t-v2.json        |     4 -
 .../gremlin/structure/io/graphson/t-v3.json        |     4 -
 .../gremlin/structure/io/graphson/textp-v2.json    |     7 -
 .../gremlin/structure/io/graphson/textp-v3.json    |     7 -
 .../structure/io/graphson/timestamp-v2.json        |     4 -
 .../structure/io/graphson/timestamp-v3.json        |     4 -
 .../structure/io/graphson/tinkergraph-v2.json      |   829 -
 .../structure/io/graphson/tinkergraph-v3.json      |   829 -
 .../structure/io/graphson/traversalmetrics-v2.json |   114 -
 .../structure/io/graphson/traversalmetrics-v3.json |   109 -
 .../structure/io/graphson/traverser-v2.json        |   109 -
 .../structure/io/graphson/traverser-v3.json        |   109 -
 .../gremlin/structure/io/graphson/uuid-v3.json     |     4 -
 .../structure/io/graphson/vertex-v1-no-types.json  |     1 -
 .../structure/io/graphson/vertex-v2-no-types.json  |     1 -
 .../gremlin/structure/io/graphson/vertex-v2.json   |   100 -
 .../structure/io/graphson/vertex-v3-no-types.json  |     1 -
 .../gremlin/structure/io/graphson/vertex-v3.json   |   100 -
 .../io/graphson/vertexproperty-v1-no-types.json    |     1 -
 .../io/graphson/vertexproperty-v2-no-types.json    |     1 -
 .../structure/io/graphson/vertexproperty-v2.json   |    11 -
 .../io/graphson/vertexproperty-v3-no-types.json    |     1 -
 .../structure/io/graphson/vertexproperty-v3.json   |    11 -
 .../gremlin/structure/io/graphson/year-v2.json     |     4 -
 .../gremlin/structure/io/graphson/year-v3.json     |     4 -
 .../structure/io/graphson/yearmonth-v2.json        |     4 -
 .../structure/io/graphson/yearmonth-v3.json        |     4 -
 .../structure/io/graphson/zoneddatetime-v2.json    |     4 -
 .../structure/io/graphson/zoneddatetime-v3.json    |     4 -
 .../structure/io/graphson/zoneoffset-v2.json       |     4 -
 .../structure/io/graphson/zoneoffset-v3.json       |     4 -
 gremlint/package-lock.json                         |    30 +-
 gremlint/package.json                              |     2 +-
 .../gremlin/hadoop/jsr223/HadoopGremlinPlugin.java |    13 +-
 .../hadoop/jsr223/HadoopRemoteAcceptor.java        |   131 -
 .../gremlin/hadoop/structure/HadoopGraph.java      |    28 -
 .../gremlin/neo4j/jsr223/Neo4jGremlinPlugin.java   |    77 -
 pom.xml                                            |     4 +-
 .../interceptor/SparkStarBarrierInterceptor.java   |     7 +-
 .../spark/SparkGraphFeatureIntegrateTest.java      |     2 +-
 .../optimization/SparkInterceptorStrategyTest.java |     4 +-
 .../gremlin/spark/structure/io/InputRDDTest.java   |     2 +-
 .../dsl/sparql/SparqlTraversalSource.java          |     2 +-
 .../jsr223/TinkerGraphGremlinPlugin.java           |     2 +
 .../tinkergraph/structure/AbstractTinkerGraph.java |    32 +-
 .../tinkergraph/structure/TinkerIoRegistryV4.java  |   216 +
 .../TinkerGraphComputerFeatureTest.java            |     2 +-
 .../TinkerTransactionGraphComputerFeatureTest.java |     2 +-
 .../tinkergraph/structure/IdManagerTest.java       |    24 +
 .../tinkergraph/structure/TinkerGraphPlayTest.java |     3 -
 ...tractTinkerGraphGraphSONTranslatorProvider.java |   302 -
 .../structure/io/graphson/GraphSONTranslator.java  |    89 -
 ...aphGraphSONv2TranslatorProcessComputerTest.java |    34 -
 ...aphGraphSONv2TranslatorProcessStandardTest.java |    34 -
 ...aphGraphSONv3TranslatorProcessComputerTest.java |    34 -
 ...aphGraphSONv3TranslatorProcessStandardTest.java |    34 -
 .../structure/io/gryo/GryoTranslator.java          |    68 -
 .../TinkerGraphGryoTranslatorComputerProvider.java |    42 -
 ...nkerGraphGryoTranslatorProcessComputerTest.java |    33 -
 ...nkerGraphGryoTranslatorProcessStandardTest.java |    33 -
 .../io/gryo/TinkerGraphGryoTranslatorProvider.java |   230 -
 1111 files changed, 50098 insertions(+), 80235 deletions(-)
 delete mode 100644 gremlin-console/conf/neo4j-standalone.properties
 delete mode 100644 gremlin-console/conf/remote-objects.yaml
 create mode 100644 gremlin-console/conf/remote-sigv4.yaml
 delete mode 100644 gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
 delete mode 100644 gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
 delete mode 100644 gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
 delete mode 100644 gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy
 delete mode 100644 gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiTraversalVisualizationStrategy.groovy
 delete mode 100644 gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
 delete mode 100644 gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
 delete mode 100644 gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiGremlinPlugin.java
 create mode 100644 gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/RemoteGremlinPlugin.java
 delete mode 100644 gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.properties
 delete mode 100644 gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.properties
 delete mode 100644 gremlin-console/src/main/resources/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.properties
 delete mode 100644 gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
 delete mode 100644 gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
 delete mode 100644 gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
 copy gremlin-server/scripts/generate-modern.groovy => gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/generate.groovy (100%)
 create mode 100644 gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote-graph.properties
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsGremlinPlugin.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/TranslatorCustomizer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLang.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/Marker.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/BindingSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ByteCodeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ClassSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateSerializer.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/DateTimeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InetAddressSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/InstantSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LambdaSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalDateTimeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/LocalTimeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MetricsSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/MonthDaySerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetDateTimeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/OffsetTimeSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/PeriodSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalMetricsSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraverserSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/YearMonthSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZoneOffsetSerializer.java
 delete mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/ZonedDateTimeSerializer.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV4.java
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/StringUtil.java
 create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnectionTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
 create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/GremlinLangTest.java
 create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/TraversalStrategyProxyTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/AnonymizingTypeTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
 delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelperTest.java
 create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/StringUtilTest.java
 create mode 100644 gremlin-dotnet/src/.config/dotnet-tools.json
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HandshakeInterceptor.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/HttpRequest.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Auth.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Basic.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/GremlinResponseHandler.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandler.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoder.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandler.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/InactiveChannelHandler.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/interceptor/PayloadSerializingInterceptor.java
 create mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleHttpClient.java
 delete mode 100644 gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterTest.java
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolTest.java
 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
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/auth/Sigv4Test.java
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpContentDecompressionHandlerTest.java
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseStreamDecoderTest.java
 create mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/handler/IdleConnectionHandlerTest.java
 delete mode 100644 gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/util/PerformanceTest.java
 delete mode 100644 gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
 delete mode 100644 gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorComputerProvider.java
 delete mode 100644 gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessComputerTest.java
 delete mode 100644 gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProcessStandardTest.java
 delete mode 100644 gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorProvider.java
 create mode 100644 gremlin-python/src/main/python/gremlin_python/driver/auth.py
 delete mode 100755 gremlin-python/src/main/python/gremlin_python/process/translator.py
 delete mode 100644 gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
 create mode 100644 gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
 delete mode 100644 gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
 delete mode 100644 gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
 create mode 100644 gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV4.py
 create mode 100644 gremlin-python/src/main/python/tests/driver/test_auth.py
 delete mode 100644 gremlin-python/src/main/python/tests/driver/test_driver_remote_connection_http.py
 create mode 100644 gremlin-python/src/main/python/tests/driver/test_protocol.py
 create mode 100644 gremlin-python/src/main/python/tests/process/test_gremlin_lang.py
 delete mode 100644 gremlin-python/src/main/python/tests/process/test_translator.py
 create mode 100644 gremlin-python/src/main/python/tests/structure/io/model.py
 delete mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV1.py
 create mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphbinaryV4.py
 create mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
 delete mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
 delete mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphsonV3d0.py
 create mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphsonV4.py
 create mode 100644 gremlin-python/src/main/python/tests/structure/io/test_graphsonv4model.py
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/OpProcessor.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ProcessingException.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizer.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizer.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizer.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Frame.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandler.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestCheckingHandler.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandler.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoder.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAndHttpBasicAuthenticationHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/Session.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SingleTaskSession.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsAndHttpChannelizerHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseFrameEncoder.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpLoader.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
 delete mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
 create mode 100644 gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinError.java
 delete mode 100644 gremlin-server/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.server.OpProcessor
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteFeatureTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryGroovyRemoteGraphProvider.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangBulkedRemoteFeatureTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteFeatureTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryLangRemoteGraphProvider.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteFeatureTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONLangRemoteFeatureTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngine.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptTestEngineFactory.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryGroovyRemoteGraphProcessStandardTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryLangRemoteGraphProcessStandardTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphBinaryRemoteGraphProcessStandardTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateWithUnifiedChannelizerTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedChannelizerIntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/UnifiedTestChannelizer.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketChannelizerIntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WebSocketTestChannelizer.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpChannelizerIntegrateTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/channel/WsAndHttpTestChannelizer.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpContentCompressionHandlerTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestIdHandlerTest.java
 create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpRequestMessageDecoderTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
 create mode 100644 gremlin-server/src/test/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineFactory
 delete mode 100644 gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/BindingsScriptEngineTest.java
 delete mode 100644 gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategy.java
 delete mode 100644 gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
 create mode 100644 gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryResourceAccess.java
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/property-v1.gbin => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-property-v4.gbin (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-binary-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-bulklist-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-list-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-map-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-path-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/empty-set-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/false-boolean-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/forever-duration-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/id-t-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-byte-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-int-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-long-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-offsetdatetime-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/max-short-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/meta-vertexproperty-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-byte-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-int-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-long-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-offsetdatetime-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/min-short-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/mixed-string-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/multi-byte-char-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nan-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-bigdecimal-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-biginteger-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-inf-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-max-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-min-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/neg-zero-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/nil-uuid-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-edge-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/no-prop-vertex-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/null-property-v4.gbin
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/direction-v1.gbin => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/out-direction-v4.gbin (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-bigdecimal-v4.gbin
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/biginteger-v1.gbin => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-biginteger-v4.gbin (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-double-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pos-inf-float-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/prop-path-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-cardinality-vertexproperty-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-char-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/single-byte-string-v4.gbin
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/uuid-v1.gbin => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/specified-uuid-v4.gbin (100%)
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytebuffer-v1.gbin => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/str-binary-v4.gbin (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinker-graph-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-edge-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-path-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-tree-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertex-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversal-vertexproperty-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/true-boolean-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/unspecified-null-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-bulklist-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-list-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-map-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/var-type-set-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zero-duration-v4.gbin
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4-no-types.json
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2.json => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-property-v4.json (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-binary-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-bulklist-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-list-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-map-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-path-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/empty-set-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/false-boolean-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/forever-duration-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/id-t-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-byte-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-int-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-long-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-short-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/meta-vertexproperty-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-byte-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-int-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-long-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-short-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/mixed-string-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/multi-byte-char-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nan-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-bigdecimal-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-biginteger-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-inf-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-max-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-min-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/neg-zero-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/nil-uuid-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-edge-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/no-prop-vertex-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/null-property-v4.json
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v2.json => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/out-direction-v4.json (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-bigdecimal-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-biginteger-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-double-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pos-inf-float-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/prop-path-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-cardinality-vertexproperty-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-char-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/single-byte-string-v4.json
 rename gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v2.json => gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/specified-uuid-v4.json (100%)
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/str-binary-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinker-graph-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4-no-types.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-edge-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4-no-types.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-path-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-tree-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4-no-types.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertex-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4-no-types.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversal-vertexproperty-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/true-boolean-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/unspecified-null-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-bulklist-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-list-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-set-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zero-duration-v4.json
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/AdjacentToIncidentStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ByModulatorOptimizationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ComputerFinalizationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ComputerVerificationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ConnectiveStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/CountStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/EarlyLimitStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/EdgeLabelVerificationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ElementIdStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/FilterRankingStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/GraphFilterStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/HaltedTraverserStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/IdentityRemovalStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/IncidentToAdjacentStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/InlineFilterStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/LambdaRestrictionStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/LazyBarrierStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/MatchAlgorithmStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/MatchPredicateStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/MessagePassingReductionStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/OptionsStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/OrderLimitStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PathProcessorStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PathRetractionStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ProductiveByStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ProfileStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ReferenceElementStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/RepeatUnrollStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/ReservedKeysVerificationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/SeedStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/StandardVerificationStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/VertexProgramRestrictionStrategy.feature
 create mode 100644 gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/VertexProgramStrategy.feature
 delete mode 100644 gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 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
 delete mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.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
 create mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4.java
 delete mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
 create mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV4.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
 create mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4.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
 create mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4.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/RequestMessageGryoSerializer.java
 delete mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
 delete mode 100644 gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/RequestMessageTest.java
 delete mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java
 delete mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
 delete mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV4Test.java
 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/GraphSONMessageSerializerV3RoundTripTest.java
 delete mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4RoundTripTest.java
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV4Test.java
 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
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV4Test.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/GraphBinaryMessageSerializerV4Test.java
 create mode 100644 gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/MessageSerializerTest.java
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json
 delete mode 100644 gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json
 delete mode 100644 hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/jsr223/HadoopRemoteAcceptor.java
 delete mode 100644 neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/jsr223/Neo4jGremlinPlugin.java
 create mode 100644 tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV4.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/AbstractTinkerGraphGraphSONTranslatorProvider.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessComputerTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv2TranslatorProcessStandardTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessComputerTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONv3TranslatorProcessStandardTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/GryoTranslator.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorComputerProvider.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessComputerTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProcessStandardTest.java
 delete mode 100644 tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/gryo/TinkerGraphGryoTranslatorProvider.java


(tinkerpop) 02/20: Get rid of P as a parameter in gherkin

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ef612699b38dc6a69fc30cb94f0a73db035e83f7
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Jul 30 10:26:35 2024 -0400

    Get rid of P as a parameter in gherkin
    
    P can't really be used that way in the grammar so doesn't make sense to test that way.
---
 .../Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs    |  7 -------
 .../test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs   |  8 ++++----
 gremlin-go/driver/cucumber/cucumberSteps_test.go          | 15 +--------------
 gremlin-go/driver/cucumber/gremlin.go                     |  8 ++++----
 .../gremlin-javascript/test/cucumber/feature-steps.js     |  4 ----
 .../gremlin-javascript/test/cucumber/gremlin.js           |  8 ++++----
 gremlin-python/src/main/python/radish/feature_steps.py    | 11 -----------
 gremlin-python/src/main/python/radish/gremlin.py          |  8 ++++----
 .../apache/tinkerpop/gremlin/features/StepDefinition.java |  5 -----
 .../tinkerpop/gremlin/test/features/filter/HasId.feature  | 13 +++++--------
 10 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 98f8b0b5b4..98d49d8df7 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -115,13 +115,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             _parameters.Add(name, parsedValue);
         }
 
-        [Given("using the parameter (\\w+) of P.(\\w+)\\(\"(.*)\"\\)")]
-        public void UsingParameterP(string name, string pval, string value)
-        {
-            var parsedValue = ParseValue(value.Replace("\\\"", "\""), _graphName!);
-            _parameters.Add(name, new P(pval, parsedValue));
-        }
-
         [Given("the traversal of")]
         public void TranslateTraversal(string traversalText)
         {
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index e72e7aa112..81c6b1fe26 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -269,9 +269,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_hasXlabel_isXpersonXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has(T.Label, __.Is("person"))}}, 
                {"g_V_hasXname_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name", (object) null)}}, 
                {"g_V_hasIdXemptyX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["xx1"]).Count()}}, 
-               {"g_V_hasIdXwithinXemptyXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["xx1"]).Count()}}, 
-               {"g_V_hasIdXwithoutXemptyXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["xx1"]).Count()}}, 
-               {"g_V_notXhasIdXwithinXemptyXXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Not(__.HasId(p["xx1"])).Count()}}, 
+               {"g_V_hasIdXwithinXemptyXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(P.Within(new List<object> {  })).Count()}}, 
+               {"g_V_hasIdXwithoutXemptyXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(P.Without(new List<object> {  })).Count()}}, 
+               {"g_V_notXhasIdXwithinXemptyXXX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Not(__.HasId(P.Within(new List<object> {  }))).Count()}}, 
                {"g_V_hasIdXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(null)}}, 
                {"g_V_hasIdXeqXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(P.Eq(null))}}, 
                {"g_V_hasIdX2_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid2"], null)}}, 
@@ -279,7 +279,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_hasIdX1AsString_2AsString_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid1"], p["vid2"], null)}}, 
                {"g_V_hasIdXnull_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(null, p["vid2"])}}, 
                {"g_V_hasIdX1X_hasIdX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasId(p["vid1"]).HasId(p["vid2"])}}, 
-               {"g_V_in_hasIdXneqX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().In().HasId(p["xx1"])}}, 
+               {"g_V_in_hasIdXneqX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().In().HasId(P.Neq(p["xx1"]))}}, 
                {"g_VX1X_out_hasIdX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Out().HasId(p["vid2"])}}, 
                {"g_VX1X_out_hasXid_2_3X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Out().HasId(p["vid2"], p["vid3"])}}, 
                {"g_VX1X_out_hasXid_2AsString_3AsStringX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Out().HasId(p["vid2"], p["vid3"])}}, 
diff --git a/gremlin-go/driver/cucumber/cucumberSteps_test.go b/gremlin-go/driver/cucumber/cucumberSteps_test.go
index fd49c7d8b4..38fbdb6207 100644
--- a/gremlin-go/driver/cucumber/cucumberSteps_test.go
+++ b/gremlin-go/driver/cucumber/cucumberSteps_test.go
@@ -47,7 +47,7 @@ var parsers map[*regexp.Regexp]func(string, string) interface{}
 
 func init() {
 	parsers = map[*regexp.Regexp]func(string, string) interface{}{
-		regexp.MustCompile(`^str\[(.*)]$`): func(stringVal, graphName string) interface{} { return stringVal }, //returns the string value as is
+		regexp.MustCompile(`^str\[(.*)]$`):          func(stringVal, graphName string) interface{} { return stringVal }, //returns the string value as is
 		regexp.MustCompile(`^dt\[(.*)]$`):           toDateTime,
 		regexp.MustCompile(`^d\[(.*)]\.[bslfdmn]$`): toNumeric,
 		regexp.MustCompile(`^d\[(.*)]\.[i]$`):       toInt32,
@@ -821,18 +821,6 @@ func (tg *tinkerPopGraph) usingTheParameterDefined(name string, params string) e
 	return nil
 }
 
-func (tg *tinkerPopGraph) usingTheParameterOfP(paramName, pVal, stringVal string) error {
-	predicate := reflect.ValueOf(gremlingo.P).MethodByName(strings.Title(pVal)).Interface().(func(...interface{}) gremlingo.Predicate)
-	values := parseValue(stringVal, tg.graphName)
-	switch reflect.TypeOf(values).Kind() {
-	case reflect.Array, reflect.Slice:
-		tg.parameters[paramName] = predicate(values.([]interface{})...)
-	default:
-		tg.parameters[paramName] = predicate(values)
-	}
-	return nil
-}
-
 func (tg *tinkerPopGraph) theTraversalWillRaiseAnError() error {
 	if _, ok := tg.error[true]; ok {
 		return nil
@@ -912,7 +900,6 @@ func InitializeScenario(ctx *godog.ScenarioContext) {
 	ctx.Step(`^the result should have a count of (\d+)$`, tg.theResultShouldHaveACountOf)
 	ctx.Step(`^the traversal of$`, tg.theTraversalOf)
 	ctx.Step(`^using the parameter (.+) defined as "(.+)"$`, tg.usingTheParameterDefined)
-	ctx.Step(`^using the parameter (.+) of P\.(.+)\("(.+)"\)$`, tg.usingTheParameterOfP)
 	ctx.Step(`^the traversal will raise an error$`, tg.theTraversalWillRaiseAnError)
 	ctx.Step(`^the traversal will raise an error with message (\w+) text of "(.+)"$`, tg.theTraversalWillRaiseAnErrorWithMessageContainingTextOf)
 }
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index 591bdd0c7c..dba9316ffb 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -239,9 +239,9 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_V_hasXlabel_isXpersonXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has(gremlingo.T.Label, gremlingo.T__.Is("person"))}}, 
     "g_V_hasXname_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", nil)}}, 
     "g_V_hasIdXemptyX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["xx1"]).Count()}}, 
-    "g_V_hasIdXwithinXemptyXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["xx1"]).Count()}}, 
-    "g_V_hasIdXwithoutXemptyXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["xx1"]).Count()}}, 
-    "g_V_notXhasIdXwithinXemptyXXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Not(gremlingo.T__.HasId(p["xx1"])).Count()}}, 
+    "g_V_hasIdXwithinXemptyXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(gremlingo.P.Within([]interface{}{})).Count()}}, 
+    "g_V_hasIdXwithoutXemptyXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(gremlingo.P.Without([]interface{}{})).Count()}}, 
+    "g_V_notXhasIdXwithinXemptyXXX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Not(gremlingo.T__.HasId(gremlingo.P.Within([]interface{}{}))).Count()}}, 
     "g_V_hasIdXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(nil)}}, 
     "g_V_hasIdXeqXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(gremlingo.P.Eq(nil))}}, 
     "g_V_hasIdX2_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid2"], nil)}}, 
@@ -249,7 +249,7 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_V_hasIdX1AsString_2AsString_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid1"], p["vid2"], nil)}}, 
     "g_V_hasIdXnull_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(nil, p["vid2"])}}, 
     "g_V_hasIdX1X_hasIdX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasId(p["vid1"]).HasId(p["vid2"])}}, 
-    "g_V_in_hasIdXneqX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().In().HasId(p["xx1"])}}, 
+    "g_V_in_hasIdXneqX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().In().HasId(gremlingo.P.Neq(p["xx1"]))}}, 
     "g_VX1X_out_hasIdX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Out().HasId(p["vid2"])}}, 
     "g_VX1X_out_hasXid_2_3X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Out().HasId(p["vid2"], p["vid3"])}}, 
     "g_VX1X_out_hasXid_2AsString_3AsStringX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Out().HasId(p["vid2"], p["vid3"])}}, 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index e590415406..bad8161e70 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -117,10 +117,6 @@ Given('the traversal of', function (traversalText) {
   this.traversal = gremlin[this.scenario].shift()(p);
 });
 
-Given(/^using the parameter (.+) of P\.(.+)\("(.+)"\)$/, function (paramName, pval, stringValue) {
-  this.parameters[paramName] =  new P(pval, parseValue.call(this, stringValue))
-});
-
 Given(/^using the parameter (.+) defined as "(.+)"$/, function (paramName, stringValue) {
   // Remove escaped chars
   stringValue = stringValue.replace(/\\"/g, '"');
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index 60bde24cd8..e140b5a3b0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -260,9 +260,9 @@ const gremlins = {
     g_V_hasXlabel_isXpersonXX: [function({g}) { return g.V().has(T.label, __.is("person")) }], 
     g_V_hasXname_nullX: [function({g}) { return g.V().has("name", null) }], 
     g_V_hasIdXemptyX_count: [function({g, xx1}) { return g.V().hasId(xx1).count() }], 
-    g_V_hasIdXwithinXemptyXX_count: [function({g, xx1}) { return g.V().hasId(xx1).count() }], 
-    g_V_hasIdXwithoutXemptyXX_count: [function({g, xx1}) { return g.V().hasId(xx1).count() }], 
-    g_V_notXhasIdXwithinXemptyXXX_count: [function({g, xx1}) { return g.V().not(__.hasId(xx1)).count() }], 
+    g_V_hasIdXwithinXemptyXX_count: [function({g}) { return g.V().hasId(P.within([])).count() }], 
+    g_V_hasIdXwithoutXemptyXX_count: [function({g}) { return g.V().hasId(P.without([])).count() }], 
+    g_V_notXhasIdXwithinXemptyXXX_count: [function({g}) { return g.V().not(__.hasId(P.within([]))).count() }], 
     g_V_hasIdXnullX: [function({g}) { return g.V().hasId(null) }], 
     g_V_hasIdXeqXnullXX: [function({g}) { return g.V().hasId(P.eq(null)) }], 
     g_V_hasIdX2_nullX: [function({g, vid2}) { return g.V().hasId(vid2, null) }], 
@@ -270,7 +270,7 @@ const gremlins = {
     g_V_hasIdX1AsString_2AsString_nullX: [function({g, vid2, vid1}) { return g.V().hasId(vid1, vid2, null) }], 
     g_V_hasIdXnull_2X: [function({g, vid2}) { return g.V().hasId(null, vid2) }], 
     g_V_hasIdX1X_hasIdX2X: [function({g, vid2, vid1}) { return g.V().hasId(vid1).hasId(vid2) }], 
-    g_V_in_hasIdXneqX1XX: [function({g, xx1}) { return g.V().in_().hasId(xx1) }], 
+    g_V_in_hasIdXneqX1XX: [function({g, xx1}) { return g.V().in_().hasId(P.neq(xx1)) }], 
     g_VX1X_out_hasIdX2X: [function({g, vid2, vid1}) { return g.V(vid1).out().hasId(vid2) }], 
     g_VX1X_out_hasXid_2_3X: [function({g, vid3, vid2, vid1}) { return g.V(vid1).out().hasId(vid2, vid3) }], 
     g_VX1X_out_hasXid_2AsString_3AsStringX: [function({g, vid3, vid2, vid1}) { return g.V(vid1).out().hasId(vid2, vid3) }], 
diff --git a/gremlin-python/src/main/python/radish/feature_steps.py b/gremlin-python/src/main/python/radish/feature_steps.py
index 27b50911de..5f72c5b0dc 100644
--- a/gremlin-python/src/main/python/radish/feature_steps.py
+++ b/gremlin-python/src/main/python/radish/feature_steps.py
@@ -109,17 +109,6 @@ def unsupported_scenario(step):
     return
 
 
-@given("using the parameter {param_name:w} of P.{p_val:w}({param:QuotedString})")
-def add_p_parameter(step, param_name, p_val, param):
-    if (step.context.ignore):
-        return
-
-    if not hasattr(step.context, "traversal_params"):
-        step.context.traversal_params = {}
-
-    step.context.traversal_params[param_name] = getattr(P, p_val)(_convert(param.replace('\\"', '"'), step.context))
-
-
 @given("using the parameter {param_name:w} defined as {param:QuotedString}")
 def add_parameter(step, param_name, param):
     if (step.context.ignore):
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 27f81c3123..72aaefa200 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -242,9 +242,9 @@ world.gremlins = {
     'g_V_hasXlabel_isXpersonXX': [(lambda g:g.V().has(T.label, __.is_('person')))], 
     'g_V_hasXname_nullX': [(lambda g:g.V().has('name', None))], 
     'g_V_hasIdXemptyX_count': [(lambda g, xx1=None:g.V().has_id(xx1).count())], 
-    'g_V_hasIdXwithinXemptyXX_count': [(lambda g, xx1=None:g.V().has_id(xx1).count())], 
-    'g_V_hasIdXwithoutXemptyXX_count': [(lambda g, xx1=None:g.V().has_id(xx1).count())], 
-    'g_V_notXhasIdXwithinXemptyXXX_count': [(lambda g, xx1=None:g.V().not_(__.has_id(xx1)).count())], 
+    'g_V_hasIdXwithinXemptyXX_count': [(lambda g:g.V().has_id(P.within([])).count())], 
+    'g_V_hasIdXwithoutXemptyXX_count': [(lambda g:g.V().has_id(P.without([])).count())], 
+    'g_V_notXhasIdXwithinXemptyXXX_count': [(lambda g:g.V().not_(__.has_id(P.within([]))).count())], 
     'g_V_hasIdXnullX': [(lambda g:g.V().has_id(None))], 
     'g_V_hasIdXeqXnullXX': [(lambda g:g.V().has_id(P.eq(None)))], 
     'g_V_hasIdX2_nullX': [(lambda g, vid2=None:g.V().has_id(vid2, None))], 
@@ -252,7 +252,7 @@ world.gremlins = {
     'g_V_hasIdX1AsString_2AsString_nullX': [(lambda g, vid2=None,vid1=None:g.V().has_id(vid1, vid2, None))], 
     'g_V_hasIdXnull_2X': [(lambda g, vid2=None:g.V().has_id(None, vid2))], 
     'g_V_hasIdX1X_hasIdX2X': [(lambda g, vid2=None,vid1=None:g.V().has_id(vid1).has_id(vid2))], 
-    'g_V_in_hasIdXneqX1XX': [(lambda g, xx1=None:g.V().in_().has_id(xx1))], 
+    'g_V_in_hasIdXneqX1XX': [(lambda g, xx1=None:g.V().in_().has_id(P.neq(xx1)))], 
     'g_VX1X_out_hasIdX2X': [(lambda g, vid2=None,vid1=None:g.V(vid1).out().has_id(vid2))], 
     'g_VX1X_out_hasXid_2_3X': [(lambda g, vid3=None,vid2=None,vid1=None:g.V(vid1).out().has_id(vid2, vid3))], 
     'g_VX1X_out_hasXid_2AsString_3AsStringX': [(lambda g, vid3=None,vid2=None,vid1=None:g.V(vid1).out().has_id(vid2, vid3))], 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
index 4bcb90f110..767f7ca158 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
@@ -288,11 +288,6 @@ public final class StepDefinition {
         stringParameters.put(key, convertToString(value));
     }
 
-    @Given("using the parameter {word} of P.{word}\\({string})")
-    public void usingTheParameterXOfPX(final String key, final String pval, final String string) {
-        stringParameters.put(key, String.format("P.%s(%s)", pval, convertToString(string)));
-    }
-
     @Given("the traversal of")
     public void theTraversalOf(final String docString) {
         try {
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasId.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasId.feature
index 8c20b41b72..cc85a5c4fe 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasId.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasId.feature
@@ -32,10 +32,9 @@ Feature: Step - hasId()
 
   Scenario: g_V_hasIdXwithinXemptyXX_count
     Given the modern graph
-    And using the parameter xx1 of P.within("l[]")
     And the traversal of
     """
-    g.V().hasId(xx1).count()
+    g.V().hasId(P.within([])).count()
     """
     When iterated to list
     Then the result should be unordered
@@ -44,10 +43,9 @@ Feature: Step - hasId()
 
   Scenario: g_V_hasIdXwithoutXemptyXX_count
     Given the modern graph
-    And using the parameter xx1 of P.without("l[]")
     And the traversal of
     """
-    g.V().hasId(xx1).count()
+    g.V().hasId(P.without([])).count()
     """
     When iterated to list
     Then the result should be unordered
@@ -56,10 +54,9 @@ Feature: Step - hasId()
 
   Scenario: g_V_notXhasIdXwithinXemptyXXX_count
     Given the modern graph
-    And using the parameter xx1 of P.within("l[]")
     And the traversal of
     """
-    g.V().not(__.hasId(xx1)).count()
+    g.V().not(__.hasId(P.within([]))).count()
     """
     When iterated to list
     Then the result should be unordered
@@ -147,10 +144,10 @@ Feature: Step - hasId()
 
   Scenario: g_V_in_hasIdXneqX1XX
     Given the modern graph
-    And using the parameter xx1 of P.neq("v[marko].id")
+    And using the parameter xx1 defined as "v[marko].id"
     And the traversal of
     """
-    g.V().in().hasId(xx1)
+    g.V().in().hasId(P.neq(xx1))
     """
     When iterated to list
     Then the result should be unordered


(tinkerpop) 10/20: wip - fixed hasLabel(String, String...) for params

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d9ace402d316685edf6a77efabe186e8c3b44efd
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Sun Aug 25 10:29:19 2024 -0400

    wip - fixed hasLabel(String, String...) for params
---
 .../language/grammar/TraversalMethodVisitor.java   |  2 +-
 .../gremlin/test/features/filter/HasLabel.feature  | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index b9cb2e5642..38aa65f6b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -771,7 +771,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
             // since we normalized above to gvalue or literal we can just test the first arg for gvalue-ness
             if (GValue.valueInstanceOf(literalOrVar, GType.STRING)) {
                 final GValue[] gvalueLiteralOrVars = literalOrVars == null ? null : Arrays.stream(literalOrVars).map(o -> (GValue) o).toArray(GValue[]::new);
-                return graphTraversal.hasLabel((GValue) literalOrVar, (GValue[]) literalOrVars);
+                return graphTraversal.hasLabel((GValue) literalOrVar, (GValue[]) gvalueLiteralOrVars);
             } else {
                 // convert object array to string array
                 final String[] stringLiteralOrVars = literalOrVars == null ? null : Arrays.stream(literalOrVars).map(o -> (String) o).toArray(String[]::new);
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
index 470019f36d..2da655e7e6 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
@@ -87,6 +87,34 @@ Feature: Step - hasLabel()
     When iterated to list
     Then the result should be empty
 
+  Scenario: g_V_hasLabelXpersonvarX_hasLabelXsoftwareX
+    Given the modern graph
+    And using the parameter xx1 defined as "person"
+    And the traversal of
+    """
+    g.V().hasLabel(xx1).hasLabel("software")
+    """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_V_hasLabelXpersonvar_softwarevarX
+    Given the modern graph
+    And using the parameter xx1 defined as "person"
+    And using the parameter xx2 defined as "software"
+    And the traversal of
+    """
+    g.V().hasLabel(xx1,xx2)
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[marko] |
+      | v[vadas] |
+      | v[josh] |
+      | v[peter] |
+      | v[lop] |
+      | v[ripple] |
+
   Scenario: g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name
     Given the modern graph
     And the traversal of


(tinkerpop) 15/20: wip - added consistent getter naming

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 84246d730c6a2970be3e1b5f6d96d763ceb7aad8
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Aug 27 07:57:48 2024 -0400

    wip - added consistent getter naming
---
 .../tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java | 6 +++++-
 .../tinkerpop/gremlin/process/traversal/step/map/CombineStep.java | 4 ++++
 .../tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java | 6 +++++-
 .../gremlin/process/traversal/step/map/ConstantStep.java          | 5 ++++-
 .../gremlin/process/traversal/step/map/DifferenceStep.java        | 6 +++++-
 .../gremlin/process/traversal/step/map/DisjunctStep.java          | 6 +++++-
 .../gremlin/process/traversal/step/map/IntersectStep.java         | 8 ++++++--
 .../tinkerpop/gremlin/process/traversal/step/map/MergeStep.java   | 6 +++++-
 .../tinkerpop/gremlin/process/traversal/step/map/ProductStep.java | 6 +++++-
 .../gremlin/process/traversal/step/sideEffect/InjectStep.java     | 4 ++--
 .../gremlin/sparql/process/traversal/strategy/SparqlStrategy.java | 3 +--
 11 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
index f9cfda6399..33b3c80944 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
@@ -58,7 +58,11 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
         random.setSeed(seed);
     }
 
-    public GValue<Double> getProbability() {
+    public double getProbability() {
+        return probability.get();
+    }
+
+    public GValue<Double> getProbabilityGValue() {
         return probability;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
index 587b7a7c72..67c120c03a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
@@ -69,6 +69,10 @@ public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implement
         return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
     }
 
+    public Object getParameter() {
+        return parameterItems.get();
+    }
+
     public GValue<Object> getParameterItems() {
         return parameterItems;
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
index 94457df007..e6bb27a2e7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
@@ -71,7 +71,11 @@ public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements Li
         }
     }
 
-    public GValue<String> getDelimiter() {
+    public String getDelimiter() {
+        return this.delimiter.get();
+    }
+
+    public GValue<String> getDelimiterGValue() {
         return this.delimiter;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 2145f7e966..3646b599b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -41,7 +41,10 @@ public class ConstantStep<S, E> extends ScalarMapStep<S, E> {
         this.constant = null == constant ? GValue.of(null) : constant;
     }
 
-    public GValue<E> getConstant() {
+    public E getConstant() {
+        return this.constant.get();
+    }
+    public GValue<E> getConstantGValue() {
         return this.constant;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
index 87f44f8639..27922b984e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
@@ -53,7 +53,11 @@ public final class DifferenceStep<S, E> extends ScalarMapStep<S, Set<?>> impleme
         return this.valueTraversal;
     }
 
-    public GValue<Object> getParameterItems() {
+    public Object getParameterItems() {
+        return parameterItems;
+    }
+
+    public GValue<Object> getParameterItemsGValue() {
         return parameterItems;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
index fc890dd2a2..c82eac3f64 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
@@ -52,7 +52,11 @@ public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implement
         return this.valueTraversal;
     }
 
-    public GValue<Object> getParameterItems() {
+    public Object getParameterItems() {
+        return parameterItems;
+    }
+
+    public GValue<Object> getParameterItemsGValue() {
         return parameterItems;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
index 93e5885e18..3c37db29e0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
@@ -53,8 +53,12 @@ public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implemen
         return this.valueTraversal;
     }
 
-    public GValue<Object> getParameterItems() {
-        return this.parameterItems;
+    public Object getParameterItems() {
+        return parameterItems;
+    }
+
+    public GValue<Object> getParameterItemsGValue() {
+        return parameterItems;
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
index e40d11c71b..2f86240a42 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
@@ -57,7 +57,11 @@ public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements Traver
         return valueTraversal;
     }
 
-    public GValue<Object> getParameterItems() {
+    public Object getParameterItems() {
+        return parameterItems;
+    }
+
+    public GValue<Object> getParameterItemsGValue() {
         return parameterItems;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
index 4842a313bb..a07b204190 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
@@ -53,7 +53,11 @@ public final class ProductStep<S, E> extends ScalarMapStep<S, List<List<?>>> imp
         return this.valueTraversal;
     }
 
-    public GValue<Object> getParameterItems() {
+    public Object getParameterItems() {
+        return parameterItems;
+    }
+
+    public GValue<Object> getParameterItemsGValue() {
         return parameterItems;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 4102cfdd57..0dae0ed01d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -52,14 +52,14 @@ public final class InjectStep<S> extends StartStep<S> {
     /**
      * Get the injections of the step.
      */
-    public GValue<S>[] getInjections() {
+    public GValue<S>[] getInjectionsGValue() {
         return this.injections;
     }
 
     /**
      * Gets the injections of the step but unwraps the {@link GValue}.
      */
-    public S[] getInjectionsAsValues() {
+    public S[] getInjections() {
         return (S[]) resolveToValues(this.injections);
     }
 }
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index f4938fb219..5f791b41d5 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
@@ -71,7 +70,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
         // assumes that the traversal starts with the single inject step that holds the sparql query
         if (traversal.getStartStep() instanceof InjectStep) {
             final InjectStep stepWithSparql = (InjectStep) traversal.getStartStep();
-            final Object[] injections = stepWithSparql.getInjectionsAsValues();
+            final Object[] injections = stepWithSparql.getInjections();
 
             // further assumes that there is just one argument to that injection which is a string (i.e. sparql query)
             if (injections.length == 1 && injections[0] instanceof String) {


(tinkerpop) 03/20: wip

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 0cb9384ba23c952f8f8416cbac47ac75de3b2585
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jul 31 16:15:58 2024 -0400

    wip
---
 .../language/grammar/TraversalMethodVisitor.java   | 61 +++++++++++++----
 .../grammar/TraversalSourceSpawnMethodVisitor.java | 14 +++-
 .../traversal/dsl/graph/GraphTraversal.java        | 72 +++++++++++++++++++
 .../traversal/dsl/graph/GraphTraversalSource.java  | 46 +++++++++++++
 .../gremlin/process/traversal/step/GType.java      | 16 ++++-
 .../gremlin/process/traversal/step/GValue.java     |  5 +-
 .../process/traversal/step/filter/CoinStep.java    |  6 +-
 .../process/traversal/step/map/CombineStep.java    | 11 +--
 .../process/traversal/step/map/ConjoinStep.java    | 17 +++--
 .../process/traversal/step/map/ConstantStep.java   |  6 +-
 .../process/traversal/step/map/GraphStep.java      | 80 +++++++++++++---------
 .../process/traversal/step/map/IntersectStep.java  | 11 +--
 .../traversal/step/sideEffect/InjectStep.java      | 14 ++--
 .../process/traversal/step/util/AbstractStep.java  | 27 ++++++++
 .../process/traversal/util/ListFunction.java       | 16 ++---
 .../gremlin/process/traversal/step/GValueTest.java | 30 ++++----
 .../tinkerpop/gremlin/features/StepDefinition.java | 32 +++++++--
 .../apache/tinkerpop/gremlin/features/World.java   |  9 +++
 .../gremlin/test/features/map/Conjoin.feature      | 12 ++++
 .../traversal/step/sideEffect/Neo4jGraphStep.java  |  4 +-
 .../traversal/step/sideEffect/TinkerGraphStep.java |  4 +-
 .../tinkerpop/gremlin/tinkergraph/TinkerWorld.java |  5 ++
 22 files changed, 382 insertions(+), 116 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index 4f523c092f..fe500e6210 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.function.BiFunction;
 
@@ -40,11 +41,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     /**
      * This object is used to append the traversal methods.
      */
-    private final GraphTraversal graphTraversal;
+    private final GraphTraversal.Admin graphTraversal;
 
     public TraversalMethodVisitor(final GremlinAntlrToJava antlr, final GraphTraversal graphTraversal) {
         super(antlr, graphTraversal);
-        this.graphTraversal = graphTraversal;
+        this.graphTraversal = graphTraversal.asAdmin();
     }
 
     /**
@@ -92,7 +93,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx) {
-        return this.graphTraversal.mergeV(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return graphTraversal.mergeV((GValue<Map<Object, Object>>) literalOrVar);
+        else
+            return graphTraversal.mergeV((Map) literalOrVar);
     }
 
     /**
@@ -124,7 +129,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx) {
-        return this.graphTraversal.mergeE(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return graphTraversal.mergeE((GValue<Map<Object, Object>>) literalOrVar);
+        else
+            return graphTraversal.mergeE((Map) literalOrVar);
     }
 
     /**
@@ -435,7 +444,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_combine_Object(final GremlinParser.TraversalMethod_combine_ObjectContext ctx) {
-        return graphTraversal.combine(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.combine((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.combine(literalOrVar);
     }
 
     /**
@@ -447,9 +460,9 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
         if (literalOrVar instanceof Number)
             return graphTraversal.coin(((Number) literalOrVar).doubleValue());
         else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isNumeric())
-            return graphTraversal.asAdmin().coin((GValue<Double>) literalOrVar);
+            return graphTraversal.coin((GValue<Double>) literalOrVar);
         else
-            throw new IllegalArgumentException("coin() argument must be a double");
+            throw new IllegalArgumentException("coin argument must be a double");
 
     }
 
@@ -458,7 +471,13 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_conjoin_String(final GremlinParser.TraversalMethod_conjoin_StringContext ctx) {
-        return graphTraversal.conjoin(antlr.argumentVisitor.parseString(ctx.stringArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitStringArgument(ctx.stringArgument());
+        if (literalOrVar instanceof String)
+            return graphTraversal.conjoin((String) literalOrVar);
+        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.STRING)
+            return graphTraversal.conjoin((GValue<String>) literalOrVar);
+        else
+            throw new IllegalArgumentException("conjoin argument must be a string");
     }
 
     /**
@@ -868,7 +887,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_intersect_Object(final GremlinParser.TraversalMethod_intersect_ObjectContext ctx) {
-        return graphTraversal.intersect(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.intersect((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.intersect(literalOrVar);
     }
 
     /**
@@ -1068,7 +1091,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_merge_Object(final GremlinParser.TraversalMethod_merge_ObjectContext ctx) {
-        return graphTraversal.merge(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.merge((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.merge(literalOrVar);
     }
 
     /**
@@ -1108,8 +1135,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_option_Object_Traversal(final GremlinParser.TraversalMethod_option_Object_TraversalContext ctx) {
-        return graphTraversal.option(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
-                antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue)
+            return graphTraversal.option((GValue) literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        else
+            return graphTraversal.option(literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
     /**
@@ -1125,8 +1155,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) {
-        return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()),
-                (Map) antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (GValue<Map>) literalOrVar);
+        else
+            return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (Map) literalOrVar);
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
index 2227635f80..8e5ba3ded2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.language.grammar;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
 
 import java.util.Map;
 
@@ -119,7 +121,11 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) {
-        return this.traversalSource.mergeV(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return this.traversalSource.asAdmin().mergeV((GValue) literalOrVar);
+        else
+            return this.traversalSource.mergeV((Map) literalOrVar);
     }
 
     /**
@@ -143,7 +149,11 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) {
-        return this.traversalSource.mergeE(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return this.traversalSource.asAdmin().mergeE((GValue) literalOrVar);
+        else
+            return this.traversalSource.mergeE((Map) literalOrVar);
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 327f72135e..5a3bb2dd8f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -459,6 +459,30 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
             return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), labels.length == 1 ? P.eq(labels[0]) : P.within(labels)));
         }
 
+        /**
+         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+         * the documentation of such steps to understand the usage context.
+         *
+         * @param token       the token that would trigger this option which may be a {@link Pick}, {@link Merge},
+         *                    a {@link Traversal}, {@link Predicate}, or object depending on the step being modulated.
+         * @param traversalOption the option as a traversal
+         * @return the traversal with the modulated step
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step" target="_blank">Reference Documentation - Choose Step</a>
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+         * @since 3.0.0-incubating
+         */
+        public default <M, E2> GraphTraversal<S, E> option(final GValue<M> token, final Traversal<?, E2> traversalOption) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, traversalOption);
+
+            // handle null similar to how option() with Map handles it, otherwise we get a NPE if this one gets used
+            final Traversal.Admin<E,E2> t = null == traversalOption ?
+                    new ConstantTraversal<>(null) : (Traversal.Admin<E, E2>) traversalOption.asAdmin();
+            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token.get(), t);
+            return this;
+        }
+
         /**
          * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
          * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
@@ -502,6 +526,54 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
             return this;
         }
 
+        /**
+         * Combines the list traverser and list argument. Also known as concatenation or append.
+         *
+         * @return the traversal with an appended {@link CombineStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#combine-step" target="_blank">Reference Documentation - Combine Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, List<?>> combine(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.combine, values);
+            return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
+        }
+
+        /**
+         * Joins together the elements of the incoming list traverser together with the provided delimiter.
+         *
+         * @return the traversal with an appended {@link ConjoinStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#conjoin-step" target="_blank">Reference Documentation - Conjoin Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, String> conjoin(final GValue<String> delimiter) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.conjoin, delimiter);
+            return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
+        }
+
+        /**
+         * Calculates the intersection between the list traverser and list argument.
+         *
+         * @return the traversal with an appended {@link IntersectStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#intersect-step" target="_blank">Reference Documentation - Intersect Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values);
+            return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
+        }
+
+        /**
+         * Merges the list traverser and list argument. Also known as union.
+         *
+         * @return the traversal with an appended {@link TraversalMergeStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
+         * @since 3.7.1
+         */
+        public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
+            return this.asAdmin().addStep(new TraversalMergeStep<>(this.asAdmin(), values));
+        }
+
         @Override
         public default <E2> GraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
             return (GraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index a28089247f..7c221d0ef8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStartStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
@@ -68,6 +69,7 @@ public class GraphTraversalSource implements TraversalSource {
     protected final Graph graph;
     protected TraversalStrategies strategies;
     protected GremlinLang gremlinLang = new GremlinLang();
+    protected Admin admin;
 
     ////////////////
 
@@ -100,6 +102,12 @@ public class GraphTraversalSource implements TraversalSource {
         this.strategies.addStrategies(new RemoteStrategy(connection));
     }
 
+    public GraphTraversalSource.Admin asAdmin() {
+        if (null == this.admin)
+            this.admin = new Admin();
+        return this.admin;
+    }
+
     @Override
     public Optional<Class<?>> getAnonymousTraversalClass() {
         return Optional.of(__.class);
@@ -618,4 +626,42 @@ public class GraphTraversalSource implements TraversalSource {
         return StringFactory.traversalSourceString(this);
     }
 
+
+    /**
+     * This class masks spawn steps that are more reserved for advanced usage.
+     */
+    public class Admin {
+
+        /**
+         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Vertex} using a
+         * {@code Map} as an argument. The {@code Map} represents search criteria and will match each of the supplied
+         * key/value pairs where the keys may be {@code String} property values or a value of {@link T}. If a match is not
+         * made it will use that search criteria to create the new {@link Vertex}.
+         *
+         * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
+         * @since 3.6.0
+         */
+        public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
+            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+            clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+            final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
+            return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate));
+        }
+
+        /**
+         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
+         * {@code Map} as an argument.
+         *
+         * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
+         * @since 4.0.0
+         */
+        public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, Object>> searchCreate) {
+            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+            clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+            final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
+            return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate));
+        }
+
+    }
+
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
index 89a8b79098..58c1fdfe4d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
@@ -52,12 +52,26 @@ public enum GType {
     GType() {}
 
     /**
-     * Returns true if the type is a number.
+     * Returns {@code true} if the type is a number.
      */
     public boolean isNumeric() {
         return this == INTEGER || this == DOUBLE || this == LONG || this == BIG_INTEGER || this == BIG_DECIMAL;
     }
 
+    /**
+     * Returns {@code true} if the type is a collection.v
+     */
+    public boolean isCollection() {
+        return this == LIST || this == SET;
+    }
+
+    /**
+     * Returns {@code true} if the type is an element.
+     */
+    public boolean isElement() {
+        return this == VERTEX || this == EDGE;
+    }
+
     /**
      * Convert an object to a matching {@link GType} and if not matched return {@link GType#UNKNOWN}.
      */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index 4de2ca1f8e..e05a9e91f4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -66,8 +66,8 @@ public class GValue<V> implements Cloneable, Serializable {
     /**
      * Gets the name of the variable if it was defined as such and returns empty if the value was a literal.
      */
-    public Optional<String> getName() {
-        return Optional.ofNullable(this.name);
+    public String getName() {
+        return this.name;
     }
 
     /**
@@ -123,6 +123,7 @@ public class GValue<V> implements Cloneable, Serializable {
     public static <V> GValue<V> of(final String name, final V value) {
         return new GValue<>(name, GType.getType(value), value);
     }
+
     /**
      * Create a new {@code GValue} for a string value.
      */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
index e220952200..f9cfda6399 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
@@ -58,14 +58,10 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
         random.setSeed(seed);
     }
 
-    public GValue<Double> getProbabilityGValue() {
+    public GValue<Double> getProbability() {
         return probability;
     }
 
-    public double getProbability() {
-        return this.probability.get();
-    }
-
     @Override
     protected boolean filter(final Traverser.Admin<S> traverser) {
         long newBulk = 0l;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
index ccf601acab..587b7a7c72 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -37,7 +38,7 @@ import java.util.Set;
  */
 public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
 
     public CombineStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
@@ -45,7 +46,7 @@ public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implement
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(values);
         }
     }
 
@@ -53,9 +54,9 @@ public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implement
     public String getStepName() { return "combine"; }
 
     @Override
-    protected List<?> map(Traverser.Admin<S> traverser) {
+    protected List<?> map(final Traverser.Admin<S> traverser) {
         final Collection listA = convertTraverserToCollection(traverser);
-        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems.get());
 
         final List combined = new ArrayList(listA);
         combined.addAll(listB);
@@ -68,7 +69,7 @@ public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implement
         return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
     }
 
-    public Object getParameterItems() {
+    public GValue<Object> getParameterItems() {
         return parameterItems;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
index ce6818b473..94457df007 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
 
@@ -34,11 +35,15 @@ import java.util.Set;
  * A map step that returns the result of joining every element in the traverser using the delimiter argument.
  */
 public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements ListFunction {
-    private String delimiter;
+    private GValue<String> delimiter;
 
     public ConjoinStep(final Traversal.Admin traversal, final String delimiter) {
+        this(traversal, GValue.of(delimiter));
+    }
+
+    public ConjoinStep(final Traversal.Admin traversal, final GValue<String> delimiter) {
         super(traversal);
-        if (null == delimiter) { throw new IllegalArgumentException("Input delimiter to conjoin step can't be null."); }
+        if (null == delimiter || null == delimiter.get()) { throw new IllegalArgumentException("Input delimiter to conjoin step can't be null."); }
         this.delimiter = delimiter;
     }
 
@@ -46,7 +51,7 @@ public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements Li
     public String getStepName() { return "conjoin"; }
 
     @Override
-    protected String map(Traverser.Admin<S> traverser) {
+    protected String map(final Traverser.Admin<S> traverser) {
         final Collection elements = convertTraverserToCollection(traverser);
         if (elements.isEmpty()) { return ""; }
 
@@ -54,19 +59,19 @@ public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements Li
 
         for (Object elem : elements) {
             if (elem != null) {
-                joinResult.append(String.valueOf(elem)).append(delimiter);
+                joinResult.append(elem).append(delimiter.get());
             }
         }
 
         if (joinResult.length() != 0) {
-            joinResult.delete(joinResult.length() - delimiter.length(), joinResult.length());
+            joinResult.delete(joinResult.length() - delimiter.get().length(), joinResult.length());
             return joinResult.toString();
         } else {
             return null;
         }
     }
 
-    public String getDelimiter() {
+    public GValue<String> getDelimiter() {
         return this.delimiter;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index bf554d1aa9..245a443e5a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -41,11 +41,7 @@ public class ConstantStep<S, E> extends ScalarMapStep<S, E> {
         this.constant = null == constant ? GValue.of(null) : constant;
     }
 
-    public E getConstant() {
-        return this.constant.get();
-    }
-
-    public GValue<E> getConstantGValue() {
+    public GValue<E> getConstant() {
         return this.constant;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index ee151aed12..5c03500d6e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -44,6 +44,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 /**
@@ -54,7 +55,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
 
     protected Parameters parameters = new Parameters();
     protected final Class<E> returnClass;
-    protected Object[] ids;
+    protected GValue<?>[] ids;
     protected transient Supplier<Iterator<E>> iteratorSupplier;
     protected boolean isStart;
     protected boolean done = false;
@@ -65,30 +66,42 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
     public GraphStep(final Traversal.Admin traversal, final Class<E> returnClass, final boolean isStart, final Object... ids) {
         super(traversal);
         this.returnClass = returnClass;
-        this.ids = (ids != null && ids.length == 1 && ids[0] instanceof Collection) ? ((Collection) ids[0]).toArray(new Object[((Collection) ids[0]).size()]) : ids;
+
+        // if ids is a single collection like g.V(['a','b','c']), then unroll it into an array of ids
+        this.ids = convertToGValues(tryUnrollSingleCollectionArgument(ids));
+
         this.isStart = isStart;
 
         this.iteratorSupplier = () -> (Iterator<E>) (Vertex.class.isAssignableFrom(this.returnClass) ?
-                this.getTraversal().getGraph().get().vertices(convertGValuesToIds()) :
-                this.getTraversal().getGraph().get().edges(convertGValuesToIds()));
+                this.getTraversal().getGraph().get().vertices(resolveToValues(this.ids)) :
+                this.getTraversal().getGraph().get().edges(resolveToValues(this.ids)));
     }
 
     /**
-     * Converts {@link GValue} objects the ids array to their values to prevent them from leaking to the Graph API.
+     * Unrolls a single collection argument into an array of ids. This is useful for steps like
+     * {@code g.V(['a','b','c'])}.
      */
-    private Object[] convertGValuesToIds() {
-        final Object[] newIds = new Object[this.ids.length];
-        for (int i = 0; i < this.ids.length; i++) {
-            if (newIds[i] instanceof GValue) {
-                newIds[i] = ((GValue) this.ids[i]).get();
-            } else {
-                newIds[i] = this.ids[i];
-            }
+    protected static Object[] tryUnrollSingleCollectionArgument(final Object[] ids) {
+        final Object[] tempIds;
+        if (ids != null && ids.length == 1) {
+            final Optional<Collection> opt;
+            if (ids[0] instanceof GValue && ((GValue<?>) ids[0]).getType().isCollection())
+                opt = Optional.of((Collection) ((GValue) ids[0]).get());
+            else if (ids[0] instanceof Collection)
+                opt = Optional.of((Collection) ids[0]);
+            else
+                opt = Optional.empty();
+
+            if (opt.isPresent()) {
+                tempIds = opt.get().toArray(new Object[opt.get().size()]);
+            } else
+                tempIds = ids;
+        } else {
+            tempIds = ids;
         }
-        return newIds;
+        return tempIds;
     }
 
-
     public String toString() {
         return StringFactory.stepString(this, this.returnClass.getSimpleName().toLowerCase(), Arrays.toString(this.ids));
     }
@@ -127,24 +140,28 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.iteratorSupplier = iteratorSupplier;
     }
 
-    public Object[] getIds() {
+    /**
+     * Get the ids associated with this step. If there are {@link GValue} objects present they will be returned
+     * alongside literal ids. Prefer {@link #getResolvedIds()} if you prefer to work with literal ids only.
+     */
+    public GValue[] getIds() {
         return this.ids;
     }
 
+    /**
+     * Gets the ids associated with this step as literal values rather than {@link GValue} objects.
+     */
+    public Object[] getResolvedIds() {
+        return resolveToValues(this.ids);
+    }
+
     public void addIds(final Object... newIds) {
-        if ((this.ids == null || this.ids.length == 0) &&
-                newIds.length == 1 &&
-                newIds[0] instanceof Collection && ((Collection) newIds[0]).isEmpty())
-            this.ids = null;
-        else
-            this.ids = ArrayUtils.addAll(this.ids,
-                    (newIds.length == 1 && newIds[0] instanceof Collection) ?
-                            ((Collection) newIds[0]).toArray(new Object[((Collection) newIds[0]).size()]) :
-                            newIds);
+        final GValue[] gvalues = convertToGValues(tryUnrollSingleCollectionArgument(newIds));
+        this.ids = ArrayUtils.addAll(this.ids, gvalues);
     }
 
     public void clearIds() {
-        this.ids = new Object[0];
+        this.ids = new GValue[0];
     }
 
     @Override
@@ -157,13 +174,10 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         if (null != this.ids) {
             // if this is going to OLAP, convert to ids so you don't serialize elements
             for (int i = 0; i < this.ids.length; i++) {
-
-                // spare the Graph API from GValue objects, as they are Gremlin level objects
-                if (this.ids[i] instanceof GValue)
-                    this.ids[i] = ((GValue) this.ids[i]).get();
-
-                if (this.ids[i] instanceof Element)
-                    this.ids[i] = ((Element) this.ids[i]).id();
+                final GValue<?> current = this.ids[i];
+                if (current.getType().isElement()) {
+                    this.ids[i] = GValue.of(current.getName(), ((Element) current.get()).id());
+                }
             }
         }
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
index 651dec7502..93e5885e18 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -36,7 +37,7 @@ import java.util.Set;
  */
 public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
 
     public IntersectStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
@@ -44,7 +45,7 @@ public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implemen
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(values);
         }
     }
 
@@ -52,7 +53,7 @@ public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implemen
         return this.valueTraversal;
     }
 
-    public Object getParameterItems() {
+    public GValue<Object> getParameterItems() {
         return this.parameterItems;
     }
 
@@ -60,9 +61,9 @@ public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implemen
     public String getStepName() { return "intersect"; }
 
     @Override
-    protected Set<?> map(Traverser.Admin<S> traverser) {
+    protected Set<?> map(final Traverser.Admin<S> traverser) {
         final Set setA = convertTraverserToSet(traverser);
-        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, this.valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, this.valueTraversal) : convertArgumentToCollection(parameterItems.get());
         final Set intersection = new HashSet();
 
         for (Object element : setB) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 0502f18541..ab57c05ce5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -19,6 +19,7 @@
 package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator;
 
 /**
@@ -26,13 +27,13 @@ import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator;
  */
 public final class InjectStep<S> extends StartStep<S> {
 
-    private final S[] injections;
+    private final GValue<S>[] injections;
 
     @SafeVarargs
     public InjectStep(final Traversal.Admin traversal, final S... injections) {
         super(traversal);
-        this.injections = injections;
-        this.start = new ArrayIterator<>(this.injections);
+        this.injections = convertToGValues(injections);
+        this.start = new ArrayIterator<>(resolveToValues(this.injections));
     }
 
     @Override
@@ -45,10 +46,13 @@ public final class InjectStep<S> extends StartStep<S> {
     @Override
     public void reset() {
         super.reset();
-        this.start = new ArrayIterator<>(this.injections);
+        this.start = new ArrayIterator<>(resolveToValues(this.injections));
     }
 
-    public S[] getInjections() {
+    /**
+     * Get the injections of the step.
+     */
+    public GValue<S>[] getInjections() {
         return this.injections;
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
index d4545ead5c..15ddacdc91 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
@@ -33,6 +34,7 @@ import java.util.LinkedHashSet;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -229,4 +231,29 @@ public abstract class AbstractStep<S, E> implements Step<S, E> {
         return traverser;
     }
 
+    /**
+     * The elements in object array argument are examined to see if they are {@link GValue} objects. If they are, they
+     * are preserved as is. If they are not then they are wrapped in a {@link GValue} object.
+     */
+    protected static <T> GValue<T>[] convertToGValues(final Object[] args) {
+        return Stream.of(args).map(id -> {
+            if (id instanceof GValue)
+                return (GValue<?>) id;
+            else
+                return GValue.of(id);
+        }).toArray(GValue[]::new);
+    }
+
+    /**
+     * Converts {@link GValue} objects the argument array to their values to prevent them from leaking to the Graph API.
+     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
+     * objects from leaking to the Graph API.
+     */
+    protected Object[] resolveToValues(final GValue<?>[] gvalues) {
+        final Object[] newIds = new Object[gvalues.length];
+        for (int i = 0; i < gvalues.length; i++) {
+            newIds[i] = gvalues[i].get();
+        }
+        return newIds;
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java
index ab693b9e29..5bf91c41e8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java
@@ -39,7 +39,7 @@ public interface ListFunction {
      * @param iterable an Iterable or array.
      * @return The iterable type as a Collection or null if argument isn't iterable.
      */
-    public static Collection asCollection(Object iterable) {
+    public static Collection asCollection(final Object iterable) {
         if (iterable instanceof Collection) {
             return (Collection) iterable;
         } else if ((iterable != null && iterable.getClass().isArray()) || iterable instanceof Iterable) {
@@ -56,7 +56,7 @@ public interface ListFunction {
      * @param iterable an Iterable or array.
      * @return The iterable type as a Collection or null if argument isn't iterable.
      */
-    public static Set asSet(Object iterable) {
+    public static Set asSet(final Object iterable) {
         if (iterable instanceof Iterable || iterable != null && iterable.getClass().isArray()) {
             return IteratorUtils.asSet(iterable);
         } else {
@@ -71,7 +71,7 @@ public interface ListFunction {
      */
     public String getStepName();
 
-    public default Collection convertArgumentToCollection(Object arg) {
+    public default Collection convertArgumentToCollection(final Object arg) {
         if (null == arg) {
             throw new IllegalArgumentException(
                     String.format("Argument provided for %s step can't be null.", getStepName()));
@@ -90,7 +90,7 @@ public interface ListFunction {
         return incoming;
     }
 
-    public default <S> Collection convertTraverserToCollection(Traverser.Admin<S> traverser) {
+    public default <S> Collection convertTraverserToCollection(final Traverser.Admin<S> traverser) {
         final S items = traverser.get();
 
         if (null == items) {
@@ -111,7 +111,7 @@ public interface ListFunction {
         return incoming;
     }
 
-    public default <S, E> Collection convertTraversalToCollection(Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
+    public default <S, E> Collection convertTraversalToCollection(final Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
         final Object array = TraversalUtil.apply(traverser, traversal);
 
         if (null == array) {
@@ -134,7 +134,7 @@ public interface ListFunction {
         return input;
     }
 
-    public default Set convertArgumentToSet(Object arg) {
+    public default Set convertArgumentToSet(final Object arg) {
         if (null == arg) {
             throw new IllegalArgumentException(
                     String.format("Argument provided for %s step can't be null.", getStepName()));
@@ -153,7 +153,7 @@ public interface ListFunction {
         return incoming;
     }
 
-    public default <S> Set convertTraverserToSet(Traverser.Admin<S> traverser) {
+    public default <S> Set convertTraverserToSet(final Traverser.Admin<S> traverser) {
         final S items = traverser.get();
 
         if (null == items) {
@@ -174,7 +174,7 @@ public interface ListFunction {
         return incoming;
     }
 
-    public default <S, E> Set convertTraversalToSet(Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
+    public default <S, E> Set convertTraversalToSet(final Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
         final Object array = TraversalUtil.apply(traverser, traversal);
 
         if (null == array) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
index fcfac9b9d9..d1742e3e29 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -54,7 +54,7 @@ public class GValueTest {
         final GValue<Integer> gValue = GValue.of("varName", 123);
         assertEquals(123, gValue.get().intValue());
         assertEquals(GType.INTEGER, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -71,7 +71,7 @@ public class GValueTest {
         final GValue<String> gValue = GValue.ofString("varName", "test");
         assertEquals("test", gValue.get());
         assertEquals(GType.STRING, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -88,7 +88,7 @@ public class GValueTest {
         final GValue<Integer> gValue = GValue.ofInteger("varName", 123);
         assertEquals(123, gValue.get().intValue());
         assertEquals(GType.INTEGER, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -105,7 +105,7 @@ public class GValueTest {
         final GValue<Boolean> gValue = GValue.ofBoolean("varName", true);
         assertEquals(true, gValue.get());
         assertEquals(GType.BOOLEAN, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -122,7 +122,7 @@ public class GValueTest {
         final GValue<Double> gValue = GValue.ofDouble("varName", 123.45);
         assertEquals(123.45, gValue.get(), 0.0);
         assertEquals(GType.DOUBLE, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -139,7 +139,7 @@ public class GValueTest {
         final GValue<BigInteger> gValue = GValue.ofBigInteger("varName", BigInteger.ONE);
         assertEquals(BigInteger.ONE, gValue.get());
         assertEquals(GType.BIG_INTEGER, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -156,7 +156,7 @@ public class GValueTest {
         final GValue<BigDecimal> gValue = GValue.ofBigDecimal("varName", BigDecimal.ONE);
         assertEquals(BigDecimal.ONE, gValue.get());
         assertEquals(GType.BIG_DECIMAL, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -173,7 +173,7 @@ public class GValueTest {
         final GValue<Long> gValue = GValue.ofLong("varName", 123L);
         assertEquals(123L, gValue.get().longValue());
         assertEquals(GType.LONG, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -196,7 +196,7 @@ public class GValueTest {
         final GValue<Map> gValue = GValue.ofMap("varName", map);
         assertEquals(map, gValue.get());
         assertEquals(GType.MAP, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -215,7 +215,7 @@ public class GValueTest {
         final GValue<List> gValue = GValue.ofList("varName", list);
         assertEquals(list, gValue.get());
         assertEquals(GType.LIST, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -234,7 +234,7 @@ public class GValueTest {
         final GValue<Set> gValue = GValue.ofSet("varName", set);
         assertEquals(set, gValue.get());
         assertEquals(GType.SET, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -253,7 +253,7 @@ public class GValueTest {
         final GValue<Vertex> gValue = GValue.ofVertex("varName", vertex);
         assertEquals(vertex, gValue.get());
         assertEquals(GType.VERTEX, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -272,7 +272,7 @@ public class GValueTest {
         final GValue<Edge> gValue = GValue.ofEdge("varName", edge);
         assertEquals(edge, gValue.get());
         assertEquals(GType.EDGE, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -291,7 +291,7 @@ public class GValueTest {
         final GValue<Path> gValue = GValue.ofPath("varName", path);
         assertEquals(path, gValue.get());
         assertEquals(GType.PATH, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 
@@ -310,7 +310,7 @@ public class GValueTest {
         final GValue<Property> gValue = GValue.ofProperty("varName", property);
         assertEquals(property, gValue.get());
         assertEquals(GType.PROPERTY, gValue.getType());
-        assertEquals("varName", gValue.getName().get());
+        assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
 }
\ No newline at end of file
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
index 767f7ca158..180c584bc0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
@@ -32,6 +32,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
 import org.apache.tinkerpop.gremlin.language.grammar.GremlinAntlrToJava;
 import org.apache.tinkerpop.gremlin.language.grammar.GremlinLexer;
 import org.apache.tinkerpop.gremlin.language.grammar.GremlinParser;
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
 import org.apache.tinkerpop.gremlin.language.translator.GremlinTranslator;
 import org.apache.tinkerpop.gremlin.language.translator.Translator;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
@@ -92,7 +93,7 @@ public final class StepDefinition {
 
     private World world;
     private GraphTraversalSource g;
-    private final Map<String, String> stringParameters = new HashMap<>();
+    private final Map<String, Object> stringParameters = new HashMap<>();
     private Traversal traversal;
     private Object result;
     private Throwable error;
@@ -285,14 +286,26 @@ public final class StepDefinition {
 
     @Given("using the parameter {word} defined as {string}")
     public void usingTheParameterXDefinedAsX(final String key, final String value) {
-        stringParameters.put(key, convertToString(value));
+        // when parameters are used literally, they are converted to string representations that can be recognized by
+        // the grammar and parsed inline. when they are used as variables, they are converted to objects that can be
+        // applied to the script as variables.
+        if (world.useParametersLiterally())
+            stringParameters.put(key, convertToString(value));
+        else
+            stringParameters.put(key, convertToObject(value));
     }
 
     @Given("the traversal of")
     public void theTraversalOf(final String docString) {
         try {
-            final String gremlin = tryUpdateDataFilePath(docString);
-            traversal = parseGremlin(applyParameters(gremlin));
+            final String rawGremlin = tryUpdateDataFilePath(docString);
+
+            // when parameters are used literally, they are converted to string representations that can be recognized by
+            // the grammar and parsed inline. when they are used as variables, they are converted to objects that can be
+            // applied to the script as variables.
+            final String gremlin = world.useParametersLiterally() ? applyParameters(rawGremlin) : rawGremlin;
+
+            traversal = parseGremlin(gremlin);
         } catch (Exception ex) {
             ex.printStackTrace();
             error = ex;
@@ -445,7 +458,14 @@ public final class StepDefinition {
         final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(normalizedGremlin));
         final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
         final GremlinParser.QueryContext ctx = parser.query();
-        return (Traversal) new GremlinAntlrToJava(g).visitQuery(ctx);
+
+        // when parameters are used literally, they are converted to string representations that can be recognized by
+        // the grammar and parsed inline. when they are used as variables, they are converted to objects that can be
+        // applied to the script as variables.
+        if (world.useParametersLiterally())
+            return (Traversal) new GremlinAntlrToJava(g).visitQuery(ctx);
+        else
+            return (Traversal) new GremlinAntlrToJava(g, new VariableResolver.DefaultVariableResolver(this.stringParameters)).visitQuery(ctx);
     }
 
     private List<Object> translateResultsToActual() {
@@ -569,7 +589,7 @@ public final class StepDefinition {
         final List<String> paramNames = new ArrayList<>(stringParameters.keySet());
         paramNames.sort((a,b) -> b.length() - a.length());
         for (String k : paramNames) {
-            replaced = replaced.replace(k, stringParameters.get(k));
+            replaced = replaced.replace(k, stringParameters.get(k).toString());
         }
         return replaced;
     }
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/World.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/World.java
index 52a977e614..726f72631a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/World.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/World.java
@@ -82,6 +82,15 @@ public interface World {
         return id.toString();
     }
 
+    /**
+     * Determines if the test should use parameters literally or treat them as variables to be applied to the script.
+     * By default, they are treated literally.
+     */
+    public default boolean useParametersLiterally() {
+        return true;
+    }
+
+
     /**
      * Allows for some flexibility in error message assertion, where the provider can handle assertions themselves.
      * Providers should use standard assertion logic as they would with tests. Note that if this method is called, then
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
index 9d9d54547e..4c9cdb483b 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
@@ -70,6 +70,18 @@ Feature: Step - conjoin()
       | result |
       | 27;29;32;35 |
 
+  Scenario: g_V_valuesXageX_order_fold_conjoinX_X
+    Given the modern graph
+    And using the parameter xx1 defined as "/"
+    And the traversal of
+      """
+      g.V().values("age").order().fold().conjoin(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 27/29/32/35 |
+
   @GraphComputerVerificationReferenceOnly
   Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX
     Given the modern graph
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
index 7ab286543c..abd0a6b801 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
@@ -66,7 +66,7 @@ public final class Neo4jGraphStep<S, E extends Element> extends GraphStep<S, E>
     private Iterator<? extends Edge> edges() {
         if (null == this.ids)
             return Collections.emptyIterator();
-        return IteratorUtils.filter(this.getTraversal().getGraph().get().edges(this.ids), edge -> HasContainer.testAll(edge, this.hasContainers));
+        return IteratorUtils.filter(this.getTraversal().getGraph().get().edges(this.getResolvedIds()), edge -> HasContainer.testAll(edge, this.hasContainers));
     }
 
     private Iterator<? extends Vertex> vertices() {
@@ -76,7 +76,7 @@ public final class Neo4jGraphStep<S, E extends Element> extends GraphStep<S, E>
 
         // ids are present, filter on them first
         if (ids.length > 0)
-            return IteratorUtils.filter(graph.vertices(ids), vertex -> HasContainer.testAll(vertex, hasContainers));
+            return IteratorUtils.filter(graph.vertices(this.getResolvedIds()), vertex -> HasContainer.testAll(vertex, hasContainers));
         ////// do index lookups //////
         graph.tx().readWrite();
         // get a label being search on
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
index 6a3e965629..e529d78390 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
@@ -75,7 +75,7 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         if (null == this.ids)
             iterator = Collections.emptyIterator();
         else if (this.ids.length > 0)
-            iterator = this.iteratorList(graph.edges(this.ids));
+            iterator = this.iteratorList(graph.edges(this.getResolvedIds()));
         else
             iterator = null == indexedContainer ?
                     this.iteratorList(graph.edges()) :
@@ -97,7 +97,7 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         if (null == this.ids)
             iterator = Collections.emptyIterator();
         else if (this.ids.length > 0)
-            iterator = this.iteratorList(graph.vertices(this.ids));
+            iterator = this.iteratorList(graph.vertices(this.getResolvedIds()));
         else
             iterator = (null == indexedContainer ?
                     this.iteratorList(graph.vertices()) :
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java
index 329a07fbae..52fd414164 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java
@@ -109,6 +109,11 @@ public abstract class TinkerWorld implements World {
         public AbstractTinkerGraph open(final Configuration configuration) {
             return TinkerGraph.open(configuration);
         }
+
+        @Override
+        public boolean useParametersLiterally() {
+            return false;
+        }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


(tinkerpop) 20/20: Fixes after rebase

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e1b8059d02af503f97172774a39601fd86530ddd
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Nov 15 09:45:19 2024 -0500

    Fixes after rebase
---
 .../traversal/dsl/graph/GraphTraversal.java        | 58 +++++++++++-----------
 .../traversal/dsl/graph/GraphTraversalSource.java  |  8 +--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index a780f742a3..ab5af2445b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -373,7 +373,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default <E2> GraphTraversal<S, E2> constant(final GValue<E2> e) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.constant, e);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.constant, e);
         return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
     }
 
@@ -432,7 +432,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Vertex> to(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabel, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.to, direction, edgeLabel, edgeLabels);
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, labels));
     }
@@ -461,7 +461,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Vertex> out(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.out, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, labels));
     }
 
@@ -489,7 +489,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Vertex> in(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.in, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, labels));
     }
 
@@ -517,7 +517,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Vertex> both(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.both, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, labels));
     }
 
@@ -547,7 +547,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Edge> toE(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabel, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.toE, direction, edgeLabel, edgeLabels);
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, labels));
     }
@@ -576,7 +576,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Edge> outE(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.outE, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, labels));
     }
 
@@ -604,7 +604,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Edge> inE(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.inE, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, labels));
     }
 
@@ -633,7 +633,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Edge> bothE(final GValue<String> label, final GValue<String>... edgeLabels) {
         final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, label, edgeLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.bothE, label, edgeLabels);
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, labels));
     }
 
@@ -1276,7 +1276,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Vertex> addV(final GValue<String> vertexLabel) {
         if (null == vertexLabel || null == vertexLabel.get()) throw new IllegalArgumentException("vertexLabel cannot be null");
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addV, vertexLabel);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.addV, vertexLabel);
         return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabel));
     }
 
@@ -1348,7 +1348,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.mergeV, searchCreate);
         final MergeVertexStep<S> step = new MergeVertexStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
         return this.asAdmin().addStep(step);
     }
@@ -1403,7 +1403,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public default GraphTraversal<S, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
         // get a construction time exception if the Map is bad
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.mergeE, searchCreate);
         final MergeEdgeStep<S> step = new MergeEdgeStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
         return this.asAdmin().addStep(step);
     }
@@ -1442,7 +1442,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Edge> addE(final GValue<String> edgeLabel) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addE, edgeLabel);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.addE, edgeLabel);
         return this.asAdmin().addStep(new AddEdgeStep<>(this.asAdmin(), edgeLabel));
     }
 
@@ -1539,7 +1539,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
             throw new IllegalArgumentException(String.format(
                     "The to() step cannot follow %s", prev.getClass().getSimpleName()));
 
-        this.asAdmin().getBytecode().addStep(Symbols.to, toStepLabel);
+        this.asAdmin().getGremlinLang().addStep(Symbols.to, toStepLabel);
         ((FromToModulating) prev).addTo(toStepLabel);
         return this;
     }
@@ -1667,7 +1667,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.call, service, params);
         final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params);
         return this.asAdmin().addStep(call);
     }
@@ -1720,7 +1720,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
         final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service, params) :
                 new CallStep(this.asAdmin(), false, service, params, childTraversal.asAdmin());
         return this.asAdmin().addStep(step);
@@ -2183,7 +2183,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.difference, values);
         return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
     }
 
@@ -2207,7 +2207,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.disjunct, values);
         return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
     }
 
@@ -2231,7 +2231,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.intersect, values);
         return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
     }
 
@@ -2255,7 +2255,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, String> conjoin(final GValue<String> delimiter) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.conjoin, delimiter);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.conjoin, delimiter);
         return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
     }
 
@@ -2279,7 +2279,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.merge, values);
         return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
     }
 
@@ -2303,7 +2303,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, List<?>> combine(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.combine, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.combine, values);
         return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
     }
 
@@ -2327,7 +2327,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, List<List<?>>> product(final GValue<Object> values) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.product, values);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.product, values);
         return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
     }
 
@@ -2680,7 +2680,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final Object value) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value);
         TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
         return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, value instanceof P ? (P) value : P.eq(value)));
     }
@@ -2745,7 +2745,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, E> hasLabel(final GValue<String> label, final GValue<String>... otherLabels) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
 
         // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
         // do this but the failure is ugly if not handled.
@@ -2979,7 +2979,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 4.0.0
      */
     public default GraphTraversal<S, E> coin(final GValue<Double> probability) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.coin, probability);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.coin, probability);
         return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
     }
 
@@ -4393,7 +4393,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 3.0.0-incubating
      */
     public default <M, E2> GraphTraversal<S, E> option(final GValue<M> token, final Traversal<?, E2> traversalOption) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, traversalOption);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, token, traversalOption);
 
         // handle null similar to how option() with Map handles it, otherwise we get a NPE if this one gets used
         final Traversal.Admin<E,E2> t = null == traversalOption ?
@@ -4414,7 +4414,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 3.7.3
      */
     public default <M, E2> GraphTraversal<S, E> option(final M token, final GValue<Map<Object, Object>> m) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, token, m);
         ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
         return this;
     }
@@ -4431,7 +4431,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @since 3.7.3
      */
     public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final GValue<Map<Object, Object>> m, final VertexProperty.Cardinality cardinality) {
-        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, merge, m, cardinality);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, merge, m, cardinality);
 
         final Map<Object, Object> map = m.get();
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 467d9d7eb4..63e49e243f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -418,7 +418,7 @@ public class GraphTraversalSource implements TraversalSource {
      */
     public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-        clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+        clone.gremlinLang.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
         final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
         return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate));
     }
@@ -464,7 +464,7 @@ public class GraphTraversalSource implements TraversalSource {
      */
     public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, Object>> searchCreate) {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-        clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+        clone.gremlinLang.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
         final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
         return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate));
     }
@@ -598,7 +598,7 @@ public class GraphTraversalSource implements TraversalSource {
      */
     public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params) {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-        clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+        clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params);
         final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
         return traversal.addStep(new CallStep<>(traversal, true, service, params));
     }
@@ -613,7 +613,7 @@ public class GraphTraversalSource implements TraversalSource {
      */
     public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params, final Traversal<S, Map> childTraversal) {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-        clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+        clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params);
         final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
         return traversal.addStep(new CallStep<>(traversal, true, service, params, childTraversal.asAdmin()));
     }


(tinkerpop) 01/20: wip - params

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit bb545cd44843d58fed733033cd601895945fa0fb
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Jul 12 10:48:20 2024 -0400

    wip - params
---
 .../gremlin/jsr223/GremlinLangScriptEngine.java    |  17 +-
 .../gremlin/jsr223/VariableResolverCustomizer.java |  40 +++
 .../gremlin/jsr223/VariableResolverPlugin.java     |  95 ++++++
 .../language/grammar/TraversalMethodVisitor.java   |  11 +-
 .../gremlin/language/grammar/VariableResolver.java |  37 ++-
 .../tinkerpop/gremlin/process/traversal/P.java     |   6 +-
 .../traversal/dsl/graph/GraphTraversal.java        | 270 +++++++++++++++++
 .../traversal/lambda/ConstantTraversal.java        |  15 +-
 .../gremlin/process/traversal/step/GType.java      |  81 ++++++
 .../gremlin/process/traversal/step/GValue.java     | 321 +++++++++++++++++++++
 .../process/traversal/step/filter/CoinStep.java    |  28 +-
 .../process/traversal/step/map/AddEdgeStep.java    |   6 +
 .../process/traversal/step/map/AddVertexStep.java  |   5 +
 .../process/traversal/step/map/ConstantStep.java   |  19 +-
 .../process/traversal/step/map/GraphStep.java      |  30 +-
 .../process/traversal/step/map/MergeEdgeStep.java  |   5 +
 .../traversal/step/map/MergeVertexStep.java        |   5 +
 .../process/traversal/step/map/VertexStep.java     |  37 ++-
 .../process/traversal/step/util/Parameters.java    |  21 +-
 .../strategy/decoration/SubgraphStrategy.java      |   2 +-
 .../optimization/AdjacentToIncidentStrategy.java   |   2 +-
 .../optimization/IncidentToAdjacentStrategy.java   |   2 +-
 .../optimization/InlineFilterStrategy.java         |  20 +-
 .../gremlin/structure/VertexProperty.java          |   3 -
 .../gremlin/structure/io/gryo/GryoVersion.java     |  12 +-
 .../gremlin/jsr223/VariableResolverPluginTest.java | 117 ++++++++
 .../language/grammar/ArgumentVisitorTest.java      | 116 ++++----
 .../language/grammar/GremlinQueryParserTest.java   |   8 +-
 .../gremlin/process/traversal/step/GTypeTest.java  |  77 +++++
 .../gremlin/process/traversal/step/GValueTest.java | 316 ++++++++++++++++++++
 .../traversal/step/util/ParametersTest.java        |  11 +
 .../tinkergraph/structure/TinkerGraphPlayTest.java |  33 ++-
 32 files changed, 1650 insertions(+), 118 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
index 440c27ad56..5528b280b1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
@@ -31,7 +31,11 @@ import javax.script.ScriptException;
 import javax.script.SimpleBindings;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * A {@link GremlinScriptEngine} implementation that evaluates Gremlin scripts using {@code gremlin-language}. As it
@@ -50,6 +54,8 @@ import java.util.Map;
 public class GremlinLangScriptEngine extends AbstractScriptEngine implements GremlinScriptEngine {
     private volatile GremlinScriptEngineFactory factory;
 
+    private final Function<Map<String, Object>, VariableResolver> variableResolverMaker;
+
     /**
      * Creates a new instance using no {@link Customizer}.
      */
@@ -58,6 +64,15 @@ public class GremlinLangScriptEngine extends AbstractScriptEngine implements Gre
     }
 
     public GremlinLangScriptEngine(final Customizer... customizers) {
+        final List<Customizer> listOfCustomizers = Arrays.asList(customizers);
+
+        // this ScriptEngine really only supports the VariableResolverCustomizer to configure the VariableResolver
+        // and can't configure it more than once. first one wins
+        final Optional<Customizer> opt = listOfCustomizers.stream().filter(c -> c instanceof VariableResolverCustomizer).findFirst();
+        variableResolverMaker = opt.isPresent() ?
+                ((VariableResolverCustomizer) opt.get()).getVariableResolverMaker() :
+                VariableResolver.DirectVariableResolver::new;
+
     }
 
     @Override
@@ -84,7 +99,7 @@ public class GremlinLangScriptEngine extends AbstractScriptEngine implements Gre
 
         final Map<String, Object> m = context.getBindings(ScriptContext.ENGINE_SCOPE);
         final GremlinAntlrToJava antlr = new GremlinAntlrToJava((GraphTraversalSource) o,
-                new VariableResolver.DefaultVariableResolver(m));
+                variableResolverMaker.apply(m));
 
         try {
             return GremlinQueryParser.parse(script, antlr);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverCustomizer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverCustomizer.java
new file mode 100644
index 0000000000..1be1f3d448
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverCustomizer.java
@@ -0,0 +1,40 @@
+/*
+ * 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.jsr223;
+
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
+
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * Supplies a {@link VariableResolver} implementation to the {@link GremlinLangScriptEngine}. This {@link Customizer}
+ * is not relevant to any other {@link GremlinScriptEngine} implementation.
+ */
+public class VariableResolverCustomizer implements Customizer {
+    private final Function<Map<String,Object>, VariableResolver> variableResolverMaker;
+
+    public VariableResolverCustomizer(final Function<Map<String, Object>, VariableResolver> variableResolverMaker) {
+        this.variableResolverMaker = variableResolverMaker;
+    }
+
+    public Function<Map<String, Object>, VariableResolver> getVariableResolverMaker() {
+        return variableResolverMaker;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPlugin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPlugin.java
new file mode 100644
index 0000000000..587f9666a1
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPlugin.java
@@ -0,0 +1,95 @@
+/*
+ * 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.jsr223;
+
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * A plugin that allows for the configuration of a {@link VariableResolver} implementation to be used by the
+ * {@link GremlinLangScriptEngine}. By default, it will use the {@link VariableResolver.DirectVariableResolver} which
+ * directly resolves variable name to a value from the binding in the script engine context. This is the most common
+ * usage relevant for most users and providers. Other options are reserved for more advanced use cases.
+ */
+public class VariableResolverPlugin extends AbstractGremlinPlugin {
+    private static final String NAME = "tinkerpop.variableResolver";
+
+    public static final Map<String, Function<Map<String, Object>, VariableResolver>> VARIABLE_RESOLVERS =
+            new HashMap<String, Function<Map<String, Object>, VariableResolver>>() {{
+                put(VariableResolver.DirectVariableResolver.class.getSimpleName(), VariableResolver.DirectVariableResolver::new);
+                put(VariableResolver.DefaultVariableResolver.class.getSimpleName(), VariableResolver.DefaultVariableResolver::new);
+                put(VariableResolver.NoVariableResolver.class.getSimpleName(), m -> VariableResolver.NoVariableResolver.instance());
+                put(VariableResolver.NullVariableResolver.class.getSimpleName(), m -> VariableResolver.NullVariableResolver.instance());
+    }};
+
+    private VariableResolverPlugin(final VariableResolverPlugin.Builder builder) {
+        super(NAME, new VariableResolverCustomizer(builder.variableResolverMaker));
+    }
+
+    /**
+     * Builds a set of static bindings.
+     */
+    public static VariableResolverPlugin.Builder build() {
+        return new VariableResolverPlugin.Builder();
+    }
+
+    public static final class Builder {
+
+        Function<Map<String,Object>, VariableResolver> variableResolverMaker = VariableResolver.DirectVariableResolver::new;
+
+        private Builder() {}
+
+        /**
+         * Sets the type of {@link VariableResolver} to use by specifying a simple class name associated with the
+         * inner classes in that interface or a fully qualified class name. The assumption is that implementations
+         * will allow a constructor that takes a {@code Map} which contains the bindings from the script engine context.
+         * Implementations are can then decide how to resolve variables in the script based on that {@code Map} or some
+         * other mechanism.
+         */
+        public VariableResolverPlugin.Builder resolver(final String resolverName) {
+            if (VARIABLE_RESOLVERS.containsKey(resolverName)) {
+                this.variableResolverMaker = VARIABLE_RESOLVERS.get(resolverName);
+            } else {
+                try {
+                    // Assuming resolverName is a fully qualified class name if it's not in the simple name map
+                    final Class<?> clazz = Class.forName(resolverName);
+                    if (VariableResolver.class.isAssignableFrom(clazz)) {
+                        this.variableResolverMaker = map -> {
+                            try {
+                                return (VariableResolver) clazz.getConstructor(Map.class).newInstance(map);
+                            } catch (Exception e) {
+                                throw new RuntimeException("Error instantiating VariableResolver", e);
+                            }
+                        };
+                    }
+                } catch (ClassNotFoundException e) {
+                    throw new RuntimeException("VariableResolver class not found: " + resolverName, e);
+                }
+            }
+            return this;
+        }
+
+        public VariableResolverPlugin create() {
+            return new VariableResolverPlugin(this);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index 440bd502c8..4f523c092f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.Order;
 import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality;
 
 import java.util.Map;
@@ -441,7 +443,14 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_coin(final GremlinParser.TraversalMethod_coinContext ctx) {
-        return graphTraversal.coin(((Number) antlr.argumentVisitor.visitFloatArgument(ctx.floatArgument())).doubleValue());
+        final Object literalOrVar = antlr.argumentVisitor.visitFloatArgument(ctx.floatArgument());
+        if (literalOrVar instanceof Number)
+            return graphTraversal.coin(((Number) literalOrVar).doubleValue());
+        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isNumeric())
+            return graphTraversal.asAdmin().coin((GValue<Double>) literalOrVar);
+        else
+            throw new IllegalArgumentException("coin() argument must be a double");
+
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java
index a97bd4b646..e017808faf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java
@@ -18,24 +18,25 @@
  */
 package org.apache.tinkerpop.gremlin.language.grammar;
 
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import java.util.Map;
 import java.util.function.BiFunction;
 
 /**
  * Resolves parameters in Gremlin to objects.
  */
-public interface VariableResolver extends BiFunction<String, GremlinParser.VariableContext, Object> {
+public interface VariableResolver<T> extends BiFunction<String, GremlinParser.VariableContext, T> {
 
     /**
      * This function resolves a variable name and the given parsers context to an object.
      */
     @Override
-    Object apply(final String varName, final GremlinParser.VariableContext variableContext);
+    T apply(final String varName, final GremlinParser.VariableContext variableContext);
 
     /**
      * This {@link VariableResolver} implementation throws exceptions for all variable names.
      */
-    class NoVariableResolver implements VariableResolver {
+    class NoVariableResolver implements VariableResolver<Object> {
         private static NoVariableResolver instance = new NoVariableResolver();
 
         public static VariableResolver instance() {
@@ -48,12 +49,35 @@ public interface VariableResolver extends BiFunction<String, GremlinParser.Varia
         }
     }
 
+    /**
+     * Allows for a provided variable set in the form of a {@code Map}, where the keys are variable names and the
+     * values are the parameter values to be injected into the traversal in their place. The value is provided to a
+     * {@link GValue} object along with the variable name for further reference.
+     */
+    class DefaultVariableResolver implements VariableResolver<GValue<?>> {
+
+        private final Map<String, Object> variables;
+
+        public DefaultVariableResolver(final Map<String, Object> variables) {
+            this.variables = variables;
+        }
+
+        @Override
+        public GValue<?> apply(final String s, final GremlinParser.VariableContext variableContext) {
+            if (!variables.containsKey(s)) {
+                throw new VariableResolverException(String.format("No variable found for %s", s));
+            }
+
+            return GValue.of(s, variables.get(s));
+        }
+    }
+
     /**
      * This {@link VariableResolver} simply provides a {@code null} value for all variable names. It's typical use
      * is for when you really don't intend to execute the traversal and just want to get an instance of one when
      * bindings are being used as with {@link NoOpTerminalVisitor}.
      */
-    class NullVariableResolver implements VariableResolver {
+    class NullVariableResolver implements VariableResolver<Object> {
         private static NullVariableResolver instance = new NullVariableResolver();
 
         public static VariableResolver instance() {
@@ -70,11 +94,11 @@ public interface VariableResolver extends BiFunction<String, GremlinParser.Varia
      * Allows for a provided variable set in the form of a {@code Map}, where the keys are variable names and the
      * values are the parameter values to be injected into the traversal in their place.
      */
-    class DefaultVariableResolver implements VariableResolver {
+    class DirectVariableResolver implements VariableResolver<Object> {
 
         private final Map<String, Object> variables;
 
-        public DefaultVariableResolver(final Map<String, Object> variables) {
+        public DirectVariableResolver(final Map<String, Object> variables) {
             this.variables = variables;
         }
 
@@ -87,4 +111,5 @@ public interface VariableResolver extends BiFunction<String, GremlinParser.Varia
             return variables.get(s);
         }
     }
+
 }
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 917a13891d..56e1946368 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.process.traversal;
 
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
 import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 
@@ -74,7 +75,10 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
 
     @Override
     public boolean test(final V testValue) {
-        return this.biPredicate.test(testValue, this.value);
+        if (this.value instanceof GValue)
+            return this.biPredicate.test(testValue, ((GValue<V>) this.value).get());
+        else
+            return this.biPredicate.test(testValue, this.value);
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 9d5b500376..327f72135e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -47,6 +47,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
 import org.apache.tinkerpop.gremlin.process.traversal.step.FromToModulating;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Mutating;
 import org.apache.tinkerpop.gremlin.process.traversal.step.ReadWriting;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TimesModulating;
@@ -230,8 +231,277 @@ import static org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality.
  */
 public interface GraphTraversal<S, E> extends Traversal<S, E> {
 
+    /**
+     * Exposes administrative methods that are either internal to TinkerPop or for users with advanced needs. This
+     * separation helps keep the Gremlin API more concise. Any {@code GraphTraversal} can get an instance of its
+     * administrative form by way of {@link GraphTraversal#asAdmin()}.
+     * <p/>
+     * Note that step overloads allowing use of {@link GValue} objects do not construct bytecode with that object.
+     * Bytecode does not make use of parameterization in that fashion so it there isn't a need to really preserve that
+     * functionality there (doing so would require changes to serializers).
+     */
     public interface Admin<S, E> extends Traversal.Admin<S, E>, GraphTraversal<S, E> {
 
+        /**
+         * Filter the <code>E</code> object given a biased coin toss. For internal use for  parameterization features.
+         *
+         * @param probability the probability that the object will pass through the filter
+         * @return the traversal with an appended {@link CoinStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#coin-step" target="_blank">Reference Documentation - Coin Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, E> coin(final GValue<Double> probability) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.coin, probability);
+            return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
+        }
+
+        /**
+         * Map any object to a fixed <code>E</code> value. For internal use for  parameterization features.
+         *
+         * @return the traversal with an appended {@link ConstantStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#constant-step" target="_blank">Reference Documentation - Constant Step</a>
+         * @since 3.7.3
+         */
+        public default <E2> GraphTraversal<S, E2> constant(final GValue<E2> e) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.constant, e);
+            return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
+        }
+
+        /**
+         * Map the {@link Vertex} to its adjacent vertices given a direction and edge labels. The arguments for the
+         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param direction  the direction to traverse from the current vertex
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> to(final Direction direction, final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its outgoing adjacent vertices given the edge labels. The arguments for the
+         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> out(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its incoming adjacent vertices given the edge labels. The arguments for the
+         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> in(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its adjacent vertices given the edge labels. The arguments for the labels must be
+         * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> both(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its incident edges given the direction and edge labels. The arguments for the
+         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param direction  the direction to traverse from the current vertex
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> toE(final Direction direction, final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its outgoing incident edges given the edge labels. The arguments for the labels
+         * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> outE(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its incoming incident edges given the edge labels. The arguments for the labels
+         * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> inE(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, edgeLabels));
+        }
+
+        /**
+         * Map the {@link Vertex} to its incident edges given the edge labels. The arguments for the labels must be
+         * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+         *
+         * @param edgeLabels the edge labels to traverse
+         * @return the traversal with an appended {@link VertexStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> bothE(final Object... edgeLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, edgeLabels);
+            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, edgeLabels));
+        }
+
+        /**
+         * Adds a {@link Vertex}.
+         *
+         * @param vertexLabel the label of the {@link Vertex} to add
+         * @return the traversal with the {@link AddVertexStep} added
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addvertex-step" target="_blank">Reference Documentation - AddVertex Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> addV(final GValue<String> vertexLabel) {
+            if (null == vertexLabel || null == vertexLabel.get()) throw new IllegalArgumentException("vertexLabel cannot be null");
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addV, vertexLabel);
+            return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabel));
+        }
+
+        /**
+         * Performs a merge (i.e. upsert) style operation for an {@link Vertex} using a {@code Map} as an argument.
+         * The {@code Map} represents search criteria and will match each of the supplied key/value pairs where the keys
+         * may be {@code String} property values or a value of {@link T}. If a match is not made it will use that search
+         * criteria to create the new {@link Vertex}.
+         *
+         * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+            final MergeVertexStep<S> step = new MergeVertexStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
+            return this.asAdmin().addStep(step);
+        }
+
+        /**
+         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
+         * {@code Map} as an argument.
+         *
+         * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
+            // get a construction time exception if the Map is bad
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+            final MergeEdgeStep<S> step = new MergeEdgeStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
+            return this.asAdmin().addStep(step);
+        }
+
+        /**
+         * Adds an {@link Edge} with the specified edge label.
+         *
+         * @param edgeLabel the label of the newly added edge
+         * @return the traversal with the {@link AddEdgeStep} added
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - AddEdge Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Edge> addE(final GValue<String> edgeLabel) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addE, edgeLabel);
+            return this.asAdmin().addStep(new AddEdgeStep<>(this.asAdmin(), edgeLabel));
+        }
+
+        /**
+         * Filters vertices, edges and vertex properties based on their label.
+         *
+         * @param label       the label of the {@link Element}
+         * @param otherLabels additional labels of the {@link Element}
+         * @return the traversal with an appended {@link HasStep}
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
+         * @since 3.2.2
+         */
+        public default GraphTraversal<S, E> hasLabel(final Object label, final Object... otherLabels) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
+
+            // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
+            // do this but the failure is ugly if not handled.
+            final int otherLabelsLength = null == otherLabels ? 0 : otherLabels.length;
+            final Object[] labels = new Object[otherLabelsLength + 1];
+            labels[0] = label;
+            if (otherLabelsLength > 0)
+                System.arraycopy(otherLabels, 0, labels, 1, otherLabelsLength);
+            return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), labels.length == 1 ? P.eq(labels[0]) : P.within(labels)));
+        }
+
+        /**
+         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+         * the documentation of such steps to understand the usage context.
+         *
+         * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
+         * @return the traversal with the modulated step
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+         * @since 3.7.3
+         */
+        public default <M, E2> GraphTraversal<S, E> option(final M token, final GValue<Map<Object, Object>> m) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m);
+            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
+            return this;
+        }
+
+        /**
+         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+         * the documentation of such steps to understand the usage context.
+         *
+         * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
+         * @return the traversal with the modulated step
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+         * @since 3.7.3
+         */
+        public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final GValue<Map<Object, Object>> m, final VertexProperty.Cardinality cardinality) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, merge, m, cardinality);
+
+            final Map<Object, Object> map = m.get();
+
+            // do explicit cardinality for every single pair in the map
+            for (Object k : map.keySet()) {
+                final Object o = map.get(k);
+                if (!(o instanceof CardinalityValueTraversal))
+                    map.put(k, new CardinalityValueTraversal(cardinality, o));
+            }
+            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption((M) merge, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
+            return this;
+        }
+
         @Override
         public default <E2> GraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
             return (GraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ConstantTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ConstantTraversal.java
index b22d88e66c..3bac69ce48 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ConstantTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ConstantTraversal.java
@@ -19,6 +19,7 @@
 package org.apache.tinkerpop.gremlin.process.traversal.lambda;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 
 import java.util.Objects;
 
@@ -29,15 +30,23 @@ import java.util.Objects;
  */
 public final class ConstantTraversal<S, E> extends AbstractLambdaTraversal<S, E> {
 
-    private final E end;
+    private final GValue<E> end;
 
     public ConstantTraversal(final E end) {
-        this.end = end;
+        this.end = null == end ? GValue.of(null) : GValue.of(end);
+    }
+
+    public ConstantTraversal(final GValue<E> end) {
+        this.end = null == end ? GValue.of(null) : end;
     }
 
     @Override
     public E next() {
-        return this.end;
+        return this.end.get();
+    }
+
+    public GValue<E> getEnd() {
+        return end;
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
new file mode 100644
index 0000000000..89a8b79098
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
@@ -0,0 +1,81 @@
+/*
+ * 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.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * An enum that describes types that are used in the Gremlin language.
+ */
+public enum GType {
+    BIG_DECIMAL,
+    BIG_INTEGER,
+    BOOLEAN,
+    DOUBLE,
+    EDGE,
+    INTEGER,
+    LIST,
+    LONG,
+    MAP,
+    PATH,
+    PROPERTY,
+    SET,
+    STRING,
+    UNKNOWN,
+    VERTEX;
+
+    GType() {}
+
+    /**
+     * Returns true if the type is a number.
+     */
+    public boolean isNumeric() {
+        return this == INTEGER || this == DOUBLE || this == LONG || this == BIG_INTEGER || this == BIG_DECIMAL;
+    }
+
+    /**
+     * Convert an object to a matching {@link GType} and if not matched return {@link GType#UNKNOWN}.
+     */
+    public static GType getType(final Object object) {
+        if (object instanceof String) return STRING;
+        else if (object instanceof Integer) return INTEGER;
+        else if (object instanceof Boolean) return BOOLEAN;
+        else if (object instanceof Double) return DOUBLE;
+        else if (object instanceof Long) return LONG;
+        else if (object instanceof Map) return MAP;
+        else if (object instanceof List) return LIST;
+        else if (object instanceof Set) return SET;
+        else if (object instanceof Vertex) return VERTEX;
+        else if (object instanceof Edge) return EDGE;
+        else if (object instanceof Path) return PATH;
+        else if (object instanceof Property) return PROPERTY;
+        else if (object instanceof BigInteger) return BIG_INTEGER;
+        else if (object instanceof BigDecimal) return BIG_DECIMAL;
+        else return UNKNOWN;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
new file mode 100644
index 0000000000..4de2ca1f8e
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -0,0 +1,321 @@
+/*
+ * 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.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * A {@code GValue} is a variable or literal value that is used in a {@link Traversal}. It is composed of a key-value
+ * pair where the key is the name given to the variable and the value is the object that the variable resolved to. If
+ * the name is not given, the value was provided literally in the traversal. The value of the variable can be any
+ * object. The {@code GValue} also includes the {@link GType} that describes the type it contains.
+ */
+public class GValue<V> implements Cloneable, Serializable {
+    private final String name;
+    private final GType type;
+
+    private final V value;
+
+    private GValue(final GType type, final V value) {
+        this(null, type, value);
+    }
+
+    private GValue(final String name, final GType type, final V value) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+    }
+
+    /**
+     * Determines if the value held by this object was defined as a variable or a literal value. Literal values simply
+     * have no name.
+     */
+    public boolean isVariable() {
+        return this.name != null;
+    }
+
+    /**
+     * Gets the name of the variable if it was defined as such and returns empty if the value was a literal.
+     */
+    public Optional<String> getName() {
+        return Optional.ofNullable(this.name);
+    }
+
+    /**
+     * Gets the type of the value. The explicit type could be determined with {@code instanceof} on the value, but this
+     * might be helpful for cases where the value was constructed with a {@code null} value which might just return as
+     * {@code Object}.
+     */
+    public GType getType() {
+        return this.type;
+    }
+
+    /**
+     * Gets the value.
+     */
+    public V get() {
+        return this.value;
+    }
+
+    @Override
+    public String toString() {
+        return isVariable() ?
+                String.format("%s&%s", name, value) : Objects.toString(value);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GValue<?> gValue = (GValue<?>) o;
+        return Objects.equals(name, gValue.name) && type == gValue.type && Objects.equals(value, gValue.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, type, value);
+    }
+
+    /**
+     * Create a new {@code Var} from a particular value but without the specified name.
+     *
+     * @param value the value of the variable
+     */
+    public static <V> GValue<V> of(final V value) {
+        return new GValue<>(GType.getType(value), value);
+    }
+
+    /**
+     * Create a new {@code Var} with the specified name and value.
+     *
+     * @param name the name of the variable
+     * @param value the value of the variable
+     */
+    public static <V> GValue<V> of(final String name, final V value) {
+        return new GValue<>(name, GType.getType(value), value);
+    }
+    /**
+     * Create a new {@code GValue} for a string value.
+     */
+    public static GValue<String> ofString(final String value) {
+        return new GValue<>(GType.STRING, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a string value with a specified name.
+     */
+    public static GValue<String> ofString(final String name, final String value) {
+        return new GValue<>(name, GType.STRING, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for an integer value.
+     */
+    public static GValue<Integer> ofInteger(final Integer value) {
+        return new GValue<>(GType.INTEGER, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for an integer value with a specified name.
+     */
+    public static GValue<Integer> ofInteger(final String name, final Integer value) {
+        return new GValue<>(name, GType.INTEGER, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a boolean value.
+     */
+    public static GValue<Boolean> ofBoolean(final Boolean value) {
+        return new GValue<>(GType.BOOLEAN, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a boolean value with a specified name.
+     */
+    public static GValue<Boolean> ofBoolean(final String name, final Boolean value) {
+        return new GValue<>(name, GType.BOOLEAN, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a double value.
+     */
+    public static GValue<Double> ofDouble(final Double value) {
+        return new GValue<>(GType.DOUBLE, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a double value with a specified name.
+     */
+    public static GValue<Double> ofDouble(final String name, final Double value) {
+        return new GValue<>(name, GType.DOUBLE, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a BigInteger value.
+     */
+    public static GValue<BigInteger> ofBigInteger(final BigInteger value) {
+        return new GValue<>(GType.BIG_INTEGER, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a BigInteger value with a specified name.
+     */
+    public static GValue<BigInteger> ofBigInteger(final String name, final BigInteger value) {
+        return new GValue<>(name, GType.BIG_INTEGER, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a BigDecimal value.
+     */
+    public static GValue<BigDecimal> ofBigDecimal(final BigDecimal value) {
+        return new GValue<>(GType.BIG_DECIMAL, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a BigDecimal value with a specified name.
+     */
+    public static GValue<BigDecimal> ofBigDecimal(final String name, final BigDecimal value) {
+        return new GValue<>(name, GType.BIG_DECIMAL, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a long value.
+     */
+    public static GValue<Long> ofLong(final Long value) {
+        return new GValue<>(GType.LONG, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a long value with a specified name.
+     */
+    public static GValue<Long> ofLong(final String name, final Long value) {
+        return new GValue<>(name, GType.LONG, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a map value.
+     */
+    public static GValue<Map> ofMap(final Map value) {
+        return new GValue<>(GType.MAP, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a map value with a specified name.
+     */
+    public static GValue<Map> ofMap(final String name, final Map value) {
+        return new GValue<>(name, GType.MAP, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a list value.
+     */
+    public static GValue<List> ofList(final List value) {
+        return new GValue<>(GType.LIST, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a list value with a specified name.
+     */
+    public static GValue<List> ofList(final String name, final List value) {
+        return new GValue<>(name, GType.LIST, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a set value.
+     */
+    public static GValue<Set> ofSet(final Set value) {
+        return new GValue<>(GType.SET, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a set value with a specified name.
+     */
+    public static GValue<Set> ofSet(final String name, final Set value) {
+        return new GValue<>(name, GType.SET, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a vertex value.
+     */
+    public static GValue<Vertex> ofVertex(final Vertex value) {
+        return new GValue<>(GType.VERTEX, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a vertex value with a specified name.
+     */
+    public static GValue<Vertex> ofVertex(final String name, final Vertex value) {
+        return new GValue<>(name, GType.VERTEX, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for an edge value.
+     */
+    public static GValue<Edge> ofEdge(final Edge value) {
+        return new GValue<>(GType.EDGE, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for an edge value with a specified name.
+     */
+    public static GValue<Edge> ofEdge(final String name, final Edge value) {
+        return new GValue<>(name, GType.EDGE, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a path value.
+     */
+    public static GValue<Path> ofPath(final Path value) {
+        return new GValue<>(GType.PATH, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a path value with a specified name.
+     */
+    public static GValue<Path> ofPath(final String name, final Path value) {
+        return new GValue<>(name, GType.PATH, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a property value.
+     */
+    public static GValue<Property> ofProperty(final Property value) {
+        return new GValue<>(GType.PROPERTY, value);
+    }
+
+    /**
+     * Create a new {@code GValue} for a property value with a specified name.
+     */
+    public static GValue<Property> ofProperty(final String name, final Property value) {
+        return new GValue<>(name, GType.PROPERTY, value);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
index e4a44abe93..e220952200 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Seedable;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
@@ -29,16 +30,27 @@ import java.util.Random;
 import java.util.Set;
 
 /**
+ * A filter step that will randomly allow traversers to pass through the step based on a probability value.
+ *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
 public final class CoinStep<S> extends FilterStep<S> implements Seedable {
 
     private final Random random = new Random();
-    private final double probability;
+    private final GValue<Double> probability;
 
+    /**
+     * @deprecated As of release 3.7.3, replaced by {@link #CoinStep(Traversal.Admin, GValue)}
+     */
+    @Deprecated
     public CoinStep(final Traversal.Admin traversal, final double probability) {
         super(traversal);
-        this.probability = probability;
+        this.probability = GValue.ofDouble(probability);
+    }
+
+    public CoinStep(final Traversal.Admin traversal, final GValue<Double> probability) {
+        super(traversal);
+        this.probability = null == probability ? GValue.ofDouble(null) : probability;
     }
 
     @Override
@@ -46,8 +58,12 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
         random.setSeed(seed);
     }
 
+    public GValue<Double> getProbabilityGValue() {
+        return probability;
+    }
+
     public double getProbability() {
-        return this.probability;
+        return this.probability.get();
     }
 
     @Override
@@ -55,11 +71,11 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
         long newBulk = 0l;
         if (traverser.bulk() < 100) {
             for (int i = 0; i < traverser.bulk(); i++) {
-                if (this.probability >= random.nextDouble())
+                if (this.probability.get() >= random.nextDouble())
                     newBulk++;
             }
         } else {
-            newBulk = Math.round(this.probability * traverser.bulk());
+            newBulk = Math.round(this.probability.get() * traverser.bulk());
         }
         if (0 == newBulk) return false;
         traverser.setBulk(newBulk);
@@ -73,7 +89,7 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
 
     @Override
     public int hashCode() {
-        return super.hashCode() ^ Double.hashCode(this.probability);
+        return super.hashCode() ^ Double.hashCode(this.probability.get());
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
index f5f7280764..9dfa4ce754 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.FromToModulating;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
@@ -59,6 +60,11 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
         this.parameters.set(this, T.label, edgeLabel);
     }
 
+    public AddEdgeStep(final Traversal.Admin traversal, final GValue<String> edgeLabel) {
+        super(traversal);
+        this.parameters.set(this, T.label, edgeLabel);
+    }
+
     public AddEdgeStep(final Traversal.Admin traversal, final Traversal.Admin<S,String> edgeLabelTraversal) {
         super(traversal);
         this.parameters.set(this, T.label, edgeLabelTraversal);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStep.java
index 0dfb55c2a1..cfde7d84fc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
@@ -52,6 +53,10 @@ public class AddVertexStep<S> extends ScalarMapStep<S, Vertex>
         this.parameters.set(this, T.label, null == label ? Vertex.DEFAULT_LABEL : label);
         userProvidedLabel = label != null;
     }
+    public AddVertexStep(final Traversal.Admin traversal, final GValue<String> label) {
+        super(traversal);
+        this.parameters.set(this, T.label, null == label ? Vertex.DEFAULT_LABEL : label);
+    }
 
     public AddVertexStep(final Traversal.Admin traversal, final Traversal.Admin<S,String> vertexLabelTraversal) {
         super(traversal);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 9434cc3b47..bf554d1aa9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
@@ -29,29 +30,37 @@ import java.util.Set;
 
 public class ConstantStep<S, E> extends ScalarMapStep<S, E> {
 
-    private final E constant;
+    private final GValue<E> constant;
 
     public ConstantStep(final Traversal.Admin traversal, final E constant) {
+        this(traversal, GValue.of(constant));
+    }
+
+    public ConstantStep(final Traversal.Admin traversal, final GValue<E> constant) {
         super(traversal);
-        this.constant = constant;
+        this.constant = null == constant ? GValue.of(null) : constant;
     }
 
     public E getConstant() {
+        return this.constant.get();
+    }
+
+    public GValue<E> getConstantGValue() {
         return this.constant;
     }
 
     @Override
     protected E map(final Traverser.Admin<S> traverser) {
-        return this.constant;
+        return this.constant.get();
     }
 
     @Override
     public String toString() {
-        return StringFactory.stepString(this, this.constant);
+        return StringFactory.stepString(this, this.constant.get());
     }
 
     @Override
     public int hashCode() {
-        return super.hashCode() ^ Objects.hashCode(this.constant);
+        return super.hashCode() ^ Objects.hashCode(this.constant.get());
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index 3b1720ff9a..ee151aed12 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GraphComputing;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
@@ -66,11 +67,28 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.returnClass = returnClass;
         this.ids = (ids != null && ids.length == 1 && ids[0] instanceof Collection) ? ((Collection) ids[0]).toArray(new Object[((Collection) ids[0]).size()]) : ids;
         this.isStart = isStart;
+
         this.iteratorSupplier = () -> (Iterator<E>) (Vertex.class.isAssignableFrom(this.returnClass) ?
-                this.getTraversal().getGraph().get().vertices(this.ids) :
-                this.getTraversal().getGraph().get().edges(this.ids));
+                this.getTraversal().getGraph().get().vertices(convertGValuesToIds()) :
+                this.getTraversal().getGraph().get().edges(convertGValuesToIds()));
     }
 
+    /**
+     * Converts {@link GValue} objects the ids array to their values to prevent them from leaking to the Graph API.
+     */
+    private Object[] convertGValuesToIds() {
+        final Object[] newIds = new Object[this.ids.length];
+        for (int i = 0; i < this.ids.length; i++) {
+            if (newIds[i] instanceof GValue) {
+                newIds[i] = ((GValue) this.ids[i]).get();
+            } else {
+                newIds[i] = this.ids[i];
+            }
+        }
+        return newIds;
+    }
+
+
     public String toString() {
         return StringFactory.stepString(this, this.returnClass.getSimpleName().toLowerCase(), Arrays.toString(this.ids));
     }
@@ -137,7 +155,13 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
 
     public void convertElementsToIds() {
         if (null != this.ids) {
-            for (int i = 0; i < this.ids.length; i++) {    // if this is going to OLAP, convert to ids so you don't serialize elements
+            // if this is going to OLAP, convert to ids so you don't serialize elements
+            for (int i = 0; i < this.ids.length; i++) {
+
+                // spare the Graph API from GValue objects, as they are Gremlin level objects
+                if (this.ids[i] instanceof GValue)
+                    this.ids[i] = ((GValue) this.ids[i]).get();
+
                 if (this.ids[i] instanceof Element)
                     this.ids[i] = ((Element) this.ids[i]).id();
             }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
index bb22d218e5..5beb203a24 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
@@ -34,6 +34,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.EventUtil;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
 import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -71,6 +72,10 @@ public class MergeEdgeStep<S> extends MergeElementStep<S, Edge, Object> {
         super(traversal, isStart, merge);
     }
 
+    public MergeEdgeStep(final Traversal.Admin traversal, final boolean isStart, final GValue<Map> merge) {
+        super(traversal, isStart, merge);
+    }
+
     public MergeEdgeStep(final Traversal.Admin traversal, final boolean isStart, final Traversal.Admin<S,Map> mergeTraversal) {
         super(traversal, isStart, mergeTraversal);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
index 9aab3790ac..e15ff745bc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.EventUtil;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
@@ -60,6 +61,10 @@ public class MergeVertexStep<S> extends MergeElementStep<S, Vertex, Map> {
         super(traversal, isStart, merge);
     }
 
+    public MergeVertexStep(final Traversal.Admin traversal, final boolean isStart, final GValue<Map> merge) {
+        super(traversal, isStart, merge);
+    }
+
     public MergeVertexStep(final Traversal.Admin traversal, final boolean isStart, final Traversal.Admin<S,Map> mergeTraversal) {
         super(traversal, isStart, mergeTraversal);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
index bd429f049c..e27fbb3802 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -39,20 +40,41 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
+ * Handles the logic of traversing to adjacent vertices or edges given a direction and edge labels for steps like,
+ * {@code out}, {@code in}, {@code both}, {@code outE}, {@code inE}, and {@code bothE}.
+ *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
 public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implements AutoCloseable, Configuring {
 
     protected Parameters parameters = new Parameters();
     private final String[] edgeLabels;
+    private final GValue<String>[] edgeLabelsGValue;
     private Direction direction;
     private final Class<E> returnClass;
 
     public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final String... edgeLabels) {
+        this(traversal, returnClass, direction, (Object[]) edgeLabels);
+    }
+
+    public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final Object... edgeLabels) {
         super(traversal);
         this.direction = direction;
-        this.edgeLabels = edgeLabels;
         this.returnClass = returnClass;
+
+        // check each edgeLabel to ensure it is a string or a GValue with a GType.STRING in it. if it is just a string
+        // then convert edgeLabels to a GValue<String> or otherwise throw an exception
+        this.edgeLabelsGValue = Arrays.stream(edgeLabels).map(edgeLabel -> {
+            if (edgeLabel instanceof String)
+                return GValue.ofString((String) edgeLabel);
+            else if (edgeLabel instanceof GValue && ((GValue<String>) edgeLabel).get().getClass().equals(String.class))
+                return (GValue<String>) edgeLabel;
+            else
+                throw new IllegalArgumentException("All edge labels must be strings");
+        }).toArray(GValue[]::new);
+
+        // convert the GValue<String> to a String[] for the edgeLabels field to cache the values
+        this.edgeLabels = Arrays.stream(this.edgeLabelsGValue).map(GValue::get).toArray(String[]::new);
     }
 
     @Override
@@ -67,6 +89,9 @@ public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implem
 
     @Override
     protected Iterator<E> flatMap(final Traverser.Admin<Vertex> traverser) {
+        // not passing GValue to graphs at this point. if a graph wants to support GValue, it should implement
+        // its own step to do so. in this way, we keep things backwards compatible and don't force folks to have
+        // deal with this until they are ready.
         return Vertex.class.isAssignableFrom(this.returnClass) ?
                 (Iterator<E>) traverser.get().vertices(this.direction, this.edgeLabels) :
                 (Iterator<E>) traverser.get().edges(this.direction, this.edgeLabels);
@@ -80,6 +105,10 @@ public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implem
         return this.edgeLabels;
     }
 
+    public GValue<String>[] getEdgeLabelsGValue() {
+        return this.edgeLabelsGValue;
+    }
+
     public Class<E> getReturnClass() {
         return this.returnClass;
     }
@@ -88,10 +117,16 @@ public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implem
         this.direction = this.direction.opposite();
     }
 
+    /**
+     * Determines if the step returns vertices.
+     */
     public boolean returnsVertex() {
         return this.returnClass.equals(Vertex.class);
     }
 
+    /**
+     * Determines if the step returns edges.
+     */
     public boolean returnsEdge() {
         return this.returnClass.equals(Edge.class);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
index d1654a344e..9b4a926c74 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
@@ -22,6 +22,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
@@ -165,7 +166,7 @@ public class Parameters implements Cloneable, Serializable {
 
     /**
      * Gets the array of keys/values of the parameters while resolving parameter values that contain
-     * {@link Traversal} instances.
+     * {@link Traversal} or {@link GValue} instances.
      */
     public <S> Object[] getKeyValues(final Traverser.Admin<S> traverser, final Object... exceptKeys) {
         if (this.parameters.isEmpty()) return EMPTY_ARRAY;
@@ -173,14 +174,28 @@ public class Parameters implements Cloneable, Serializable {
         for (final Map.Entry<Object, List<Object>> entry : this.parameters.entrySet()) {
             if (!ArrayUtils.contains(exceptKeys, entry.getKey())) {
                 for (final Object value : entry.getValue()) {
-                    keyValues.add(entry.getKey() instanceof Traversal.Admin ? TraversalUtil.apply(traverser, (Traversal.Admin<S, ?>) entry.getKey()) : entry.getKey());
-                    keyValues.add(value instanceof Traversal.Admin ? TraversalUtil.apply(traverser, (Traversal.Admin<S, ?>) value) : value);
+                    keyValues.add(resolve(entry.getKey(), traverser));
+                    keyValues.add(resolve(value, traverser));
                 }
             }
         }
         return keyValues.toArray(new Object[keyValues.size()]);
     }
 
+    /**
+     * Takes an object and tests if it is a {@link GValue} or a {@link Traversal} and if so, resolves it to its value
+     * otherwise it just returns itself.
+     */
+    private static <S> Object resolve(final Object object, final Traverser.Admin<S> traverser) {
+        if (object instanceof Traversal.Admin) {
+            return TraversalUtil.apply(traverser, (Traversal.Admin<S, ?>) object);
+        } else if (object instanceof GValue) {
+            return ((GValue) object).get();
+        } else {
+            return object;
+        }
+    }
+
     /**
      * Gets an immutable set of the parameters without evaluating them in the context of a {@link Traverser} as
      * is done in {@link #getKeyValues(Traverser.Admin, Object...)}.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 6f34d62226..b44b62f0e3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -193,7 +193,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
                 continue;
 
             if (edgeCriterion != null) {
-                final VertexStep<Edge> someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabels());
+                final VertexStep<Edge> someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabelsGValue());
                 final Step<Edge, Vertex> someVStep = step.getDirection() == Direction.BOTH ?
                         new EdgeOtherVertexStep(traversal) :
                         new EdgeVertexStep(traversal, step.getDirection().opposite());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
index d8e538ab37..b33d527c2c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
@@ -118,7 +118,7 @@ public final class AdjacentToIncidentStrategy extends AbstractTraversalStrategy<
         final Step newStep;
         if (step instanceof VertexStep) {
             final VertexStep vs = (VertexStep) step;
-            newStep = new VertexStep<>(traversal, Edge.class, vs.getDirection(), vs.getEdgeLabels());
+            newStep = new VertexStep<>(traversal, Edge.class, vs.getDirection(), vs.getEdgeLabelsGValue());
         } else if (step instanceof PropertiesStep) {
             final PropertiesStep ps = (PropertiesStep) step;
             newStep = new PropertiesStep(traversal, PropertyType.PROPERTY, ps.getPropertyKeys());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
index 75d55adcd0..813b60b955 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
@@ -110,7 +110,7 @@ public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<
      * @param step2     the vertex-emitting step to replace
      */
     private static void optimizeSteps(final Traversal.Admin traversal, final VertexStep step1, final Step step2) {
-        final Step newStep = new VertexStep(traversal, Vertex.class, step1.getDirection(), step1.getEdgeLabels());
+        final Step newStep = new VertexStep(traversal, Vertex.class, step1.getDirection(), step1.getEdgeLabelsGValue());
         for (final String label : (Iterable<String>) step2.getLabels()) {
             newStep.addLabel(label);
         }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index d2713218c5..5ff63b3e0f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -26,6 +26,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
@@ -124,26 +126,28 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
                 && ((VertexStep) step.getPreviousStep()).returnsEdge()
                 && 0 == ((VertexStep) step.getPreviousStep()).getEdgeLabels().length) {
             final VertexStep<Edge> previousStep = (VertexStep<Edge>) step.getPreviousStep();
-            final List<String> edgeLabels = new ArrayList<>();
+            final List<Object> edgeLabels = new ArrayList<>();
             for (final HasContainer hasContainer : new ArrayList<>(step.getHasContainers())) {
                 if (hasContainer.getKey().equals(T.label.getAccessor())) {
                     if (hasContainer.getBiPredicate() == Compare.eq &&
-                            hasContainer.getValue() instanceof String &&
+                            (hasContainer.getValue() instanceof String ||
+                                    (hasContainer.getValue() instanceof GValue && ((GValue) hasContainer.getValue()).getType() == GType.STRING)) &&
                             edgeLabels.isEmpty()) {
-                        edgeLabels.add((String) hasContainer.getValue());
+                        edgeLabels.add(hasContainer.getValue());
                         step.removeHasContainer(hasContainer);
                     } else if (hasContainer.getBiPredicate() == Contains.within &&
                             hasContainer.getValue() instanceof Collection &&
                             ((Collection) hasContainer.getValue()).containsAll(edgeLabels)) {
-                        edgeLabels.addAll((Collection<String>) hasContainer.getValue());
+                        edgeLabels.addAll((Collection) hasContainer.getValue());
                         step.removeHasContainer(hasContainer);
                     } else if (hasContainer.getPredicate() instanceof OrP && edgeLabels.isEmpty()) {
                         boolean removeContainer = true;
                         final List<P<?>> orps = ((OrP) hasContainer.getPredicate()).getPredicates();
-                        final List<String> newEdges = new ArrayList<>();
+                        final List<Object> newEdges = new ArrayList<>();
                         for (int i = 0; i < orps.size(); i++) {
-                            if (orps.get(i).getBiPredicate() == Compare.eq && orps.get(i).getValue() instanceof String)
-                                newEdges.add((String) orps.get(i).getValue());
+                            if (orps.get(i).getBiPredicate() == Compare.eq && (orps.get(i).getValue() instanceof String ||
+                                    (orps.get(i).getValue() instanceof GValue && ((GValue) orps.get(i).getValue()).getType() == GType.STRING)))
+                                newEdges.add(orps.get(i).getValue());
                             else {
                                 removeContainer = false;
                                 break;
@@ -157,7 +161,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
                 }
             }
             if (!edgeLabels.isEmpty()) {
-                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), edgeLabels.toArray(new String[edgeLabels.size()]));
+                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), edgeLabels.toArray(new Object[edgeLabels.size()]));
                 TraversalHelper.replaceStep(previousStep, newVertexStep, traversal);
                 TraversalHelper.copyLabels(previousStep, newVertexStep, false);
                 if (step.getHasContainers().isEmpty()) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
index af7a18a1d9..962140adb5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
@@ -18,9 +18,6 @@
  */
 package org.apache.tinkerpop.gremlin.structure;
 
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyVertexProperty;
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index b06509a4b0..7fa37b5acb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -38,6 +38,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Text;
 import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
@@ -325,7 +327,7 @@ public enum GryoVersion {
 
             add(GryoTypeReg.of(P.class, 124, new GryoSerializersV3.PSerializer()));
             add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV3.TextPSerializer()));
-            add(GryoTypeReg.of(Text.RegexPredicate.class, 197));                                       // ***LAST ID***
+            add(GryoTypeReg.of(Text.RegexPredicate.class, 197));
             add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV3.LambdaSerializer()));
             add(GryoTypeReg.of(Order.class, 127));
             add(GryoTypeReg.of(Scope.class, 128));
@@ -422,6 +424,9 @@ public enum GryoVersion {
             add(GryoTypeReg.of(Stack.class, 181));
             add(GryoTypeReg.of(ReferenceMap.class, 182));
 
+            add(GryoTypeReg.of(GValue.class, 199, new JavaSerializer()));
+            add(GryoTypeReg.of(GType.class, 200, new JavaSerializer()));        // ***LAST ID***
+
             // placeholder serializers for classes that don't live here in core. this will allow them to be used if
             // present  or ignored if the class isn't available. either way the registration numbers are held as
             // placeholders so that the format stays stable
@@ -538,7 +543,7 @@ public enum GryoVersion {
             add(GryoTypeReg.of(Pop.class, 133));
             add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
             add(GryoTypeReg.of(Pick.class, 137));
-            add(GryoTypeReg.of(DT.class, 198));     // ***LAST ID***
+            add(GryoTypeReg.of(DT.class, 198));
             add(GryoTypeReg.of(Merge.class, 196));
             add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
             add(GryoTypeReg.of(MultiComparator.class, 165));
@@ -629,6 +634,9 @@ public enum GryoVersion {
             add(GryoTypeReg.of(LabelledCounter.class, 180));
             add(GryoTypeReg.of(Stack.class, 181));
             add(GryoTypeReg.of(ReferenceMap.class, 182));
+
+            add(GryoTypeReg.of(GValue.class, 199, new JavaSerializer()));
+            add(GryoTypeReg.of(GType.class, 200, new JavaSerializer()));        // ***LAST ID***
         }};
     }
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPluginTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPluginTest.java
new file mode 100644
index 0000000000..0d3dc5fd96
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/VariableResolverPluginTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.jsr223;
+
+import org.apache.tinkerpop.gremlin.language.grammar.GremlinParser;
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
+import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.fail;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class VariableResolverPluginTest {
+
+    @Test
+    public void shouldProduceNullVariableResolver() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                resolver(VariableResolver.NullVariableResolver.class.getSimpleName()).create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(VariableResolver.NullVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceNoVariableResolver() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                resolver(VariableResolver.NoVariableResolver.class.getSimpleName()).create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(VariableResolver.NoVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceDefaultVariableResolver() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                resolver(VariableResolver.DefaultVariableResolver.class.getSimpleName()).create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(VariableResolver.DefaultVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceDirectVariableResolver() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                resolver(VariableResolver.DirectVariableResolver.class.getSimpleName()).create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(VariableResolver.DirectVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceDefaultedVariableResolverWhenNoSpecified() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(VariableResolver.DirectVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceCustomVariableResolverForFullyQualifiedClassName() {
+        final Map<String, Object> bindings = new HashMap<>();
+        final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                resolver(CustomVariableResolver.class.getName()).create();
+        final VariableResolver resolver = ((VariableResolverCustomizer) plugin.getCustomizers().
+                get()[0]).getVariableResolverMaker().apply(bindings);
+        assertThat(resolver, instanceOf(CustomVariableResolver.class));
+    }
+
+    @Test
+    public void shouldProduceExceptionVariableResolverIfResolverNotFound() {
+        try {
+            final VariableResolverPlugin plugin = VariableResolverPlugin.build().
+                    resolver("NotAResolver").create();
+            fail("The resolver does not exist and should have failed");
+        } catch (Exception re) {
+            assertThat(re.getMessage(), containsString("VariableResolver class not found: NotAResolver"));
+        }
+    }
+
+    /**
+     * Custom test implementation of {@link VariableResolver} that is not part of the standard set of implementations.
+     * This class does nothing.
+     */
+    public static class CustomVariableResolver implements VariableResolver<Object> {
+        public CustomVariableResolver(final Map<String, Object> m) {
+        }
+
+        @Override
+        public Object apply(final String varName, final GremlinParser.VariableContext variableContext) {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java
index 43f33054b5..e9c98cd2c3 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java
@@ -84,81 +84,81 @@ public class ArgumentVisitorTest {
     public static Iterable<Object[]> generateTestParameters() {
         return Arrays.asList(new Object[][]{
                 {Boolean.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Boolean.class, "true", true, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
-                {Boolean.class, "false", false, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
-                {Boolean.class, "x", true, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
+                {Boolean.class, "true", true, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", true)))},
+                {Boolean.class, "false", false, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", true)))},
+                {Boolean.class, "x", true, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", true)))},
                 {Integer.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Integer.class, "0", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
-                {Integer.class, "0i", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
-                {Integer.class, "0L", 0L, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
-                {Integer.class, "x", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0)))},
-                {Integer.class, "x", 0L, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0L)))},
+                {Integer.class, "0", 0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "0i", 0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "0L", 0L, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "x", 0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 0)))},
+                {Integer.class, "x", 0L, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 0L)))},
                 {Float.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Float.class, "0.0d", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0)))},
-                {Float.class, "0d", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0)))},
-                {Float.class, "0F", 0.0F, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0F)))},
-                {Float.class, "x", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0.0)))},
-                {Float.class, "x", 0.0F, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0.0F)))},
+                {Float.class, "0.0d", 0.0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 1000.0)))},
+                {Float.class, "0d", 0.0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 1000.0)))},
+                {Float.class, "0F", 0.0F, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 1000.0F)))},
+                {Float.class, "x", 0.0, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 0.0)))},
+                {Float.class, "x", 0.0F, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 0.0F)))},
                 {String.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {String.class, "'test'", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {String.class, "x", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "test")))},
-                {String.class, "x", "graphson", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", IO.graphson)))},
+                {String.class, "'test'", "test", createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {String.class, "x", "test", createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "test")))},
+                {String.class, "x", "graphson", createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", IO.graphson)))},
                 {StringNullable.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {StringNullable.class, "null", null, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {StringNullable.class, "x", null, createAntlr(new VariableResolver.DefaultVariableResolver(nullMap))},
+                {StringNullable.class, "null", null, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {StringNullable.class, "x", null, createAntlr(new VariableResolver.DirectVariableResolver(nullMap))},
                 {Object.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Object.class, "'test'", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Object.class, "x", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "test")))},
-                {Object.class, "x", now, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
-                {Object.class, "[1,2,3]", Arrays.asList(1, 2, 3), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
-                {Object.class, "x", P.eq(100), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", P.eq(100))))},
+                {Object.class, "'test'", "test", createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Object.class, "x", "test", createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "test")))},
+                {Object.class, "x", now, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", now)))},
+                {Object.class, "[1,2,3]", Arrays.asList(1, 2, 3), createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", now)))},
+                {Object.class, "x", P.eq(100), createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", P.eq(100))))},
                 {Direction.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Direction.class, "Direction.OUT", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Direction.class, "OUT", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Direction.class, "x", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.OUT)))},
-                {Direction.class, "x", Direction.from, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.from)))},
+                {Direction.class, "Direction.OUT", Direction.OUT, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Direction.class, "OUT", Direction.OUT, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Direction.class, "x", Direction.OUT, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Direction.OUT)))},
+                {Direction.class, "x", Direction.from, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Direction.from)))},
                 {Vertex.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Vertex.class, "new Vertex(1i,'person')", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.from)))},
-                {Vertex.class, "x", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", new ReferenceVertex(1, "person"))))},
+                {Vertex.class, "new Vertex(1i,'person')", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Direction.from)))},
+                {Vertex.class, "x", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", new ReferenceVertex(1, "person"))))},
                 {Order.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Order.class, "Order.desc", Order.desc, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Order.class, "x", Order.desc, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Order.desc)))},
+                {Order.class, "Order.desc", Order.desc, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Order.class, "x", Order.desc, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Order.desc)))},
                 {Scope.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Scope.class, "Scope.local", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Scope.class, "local", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Scope.class, "x", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Scope.local)))},
+                {Scope.class, "Scope.local", Scope.local, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Scope.class, "local", Scope.local, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Scope.class, "x", Scope.local, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Scope.local)))},
                 {T.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {T.class, "T.label", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {T.class, "label", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {T.class, "x", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", T.label)))},
+                {T.class, "T.label", T.label, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {T.class, "label", T.label, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {T.class, "x", T.label, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", T.label)))},
                 {VertexProperty.Cardinality.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {VertexProperty.Cardinality.class, "Cardinality.list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {VertexProperty.Cardinality.class, "list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {VertexProperty.Cardinality.class, "x", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", VertexProperty.Cardinality.list)))},
+                {VertexProperty.Cardinality.class, "Cardinality.list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {VertexProperty.Cardinality.class, "list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {VertexProperty.Cardinality.class, "x", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", VertexProperty.Cardinality.list)))},
                 {DT.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {DT.class, "DT.hour", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {DT.class, "hour", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {DT.class, "x", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", DT.hour)))},
+                {DT.class, "DT.hour", DT.hour, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {DT.class, "hour", DT.hour, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {DT.class, "x", DT.hour, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", DT.hour)))},
                 {Merge.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Merge.class, "Merge.onMatch", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Merge.class, "onMatch", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Merge.class, "x", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Merge.onMatch)))},
+                {Merge.class, "Merge.onMatch", Merge.onMatch, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Merge.class, "onMatch", Merge.onMatch, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Merge.class, "x", Merge.onMatch, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Merge.onMatch)))},
                 {Pop.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Pop.class, "Pop.last", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Pop.class, "last", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Pop.class, "x", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Pop.last)))},
+                {Pop.class, "Pop.last", Pop.last, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Pop.class, "last", Pop.last, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Pop.class, "x", Pop.last, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Pop.last)))},
                 {Operator.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Operator.class, "Operator.sum", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Operator.class, "sum", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Operator.class, "x", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Operator.sum)))},
+                {Operator.class, "Operator.sum", Operator.sum, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Operator.class, "sum", Operator.sum, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Operator.class, "x", Operator.sum, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Operator.sum)))},
                 {Column.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {Column.class, "Column.keys", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Column.class, "keys", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {Column.class, "x", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Column.keys)))},
+                {Column.class, "Column.keys", Column.keys, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Column.class, "keys", Column.keys, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Column.class, "x", Column.keys, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", Column.keys)))},
                 {SackFunctions.Barrier.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
-                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
-                {SackFunctions.Barrier.class, "x", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", SackFunctions.Barrier.normSack)))},
+                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {SackFunctions.Barrier.class, "x", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", SackFunctions.Barrier.normSack)))},
         });
     }
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
index 4e7168a7f5..a286e2e5fd 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
@@ -41,7 +41,7 @@ public class GremlinQueryParserTest {
     public void shouldParseVariables() {
         final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
                 EmptyGraph.instance(), __::start, g,
-                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("z", 50)));
+                new VariableResolver.DirectVariableResolver(ElementHelper.asMap("z", 50)));
         final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
 
         assertEquals(g.V().has("name", P.gt(50)).asAdmin().getGremlinLang(),
@@ -52,7 +52,7 @@ public class GremlinQueryParserTest {
     public void shouldParseVariablesInVarargs() {
         final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
                 EmptyGraph.instance(), __::start, g,
-                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100,
                                                                                  "y", 200,
                                                                                  "z", 50)));
 
@@ -73,7 +73,7 @@ public class GremlinQueryParserTest {
     public void shouldNotParseVariablesInList() {
         final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
                 EmptyGraph.instance(), __::start, g,
-                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100,
                         "y", 200,
                         "z", 50)));
         GremlinQueryParser.parse("g.V([x, y, 300]).has('name',gt(z))", gremlinAntlrToJava);
@@ -83,7 +83,7 @@ public class GremlinQueryParserTest {
     public void shouldNotParseVariablesWhichAreTraversalBased() {
         final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
                 EmptyGraph.instance(), __::start, g,
-                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                new VariableResolver.DirectVariableResolver(ElementHelper.asMap("x", 100,
                         "y", 200,
                         "z", __.out())));
         GremlinQueryParser.parse("g.V([x, y, 300]).where(z)", gremlinAntlrToJava);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GTypeTest.java
new file mode 100644
index 0000000000..9596445860
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GTypeTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collections;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class GTypeTest {
+
+    @Test
+    public void shouldReturnTrueForNumericTypes() {
+        assertThat(GType.INTEGER.isNumeric(), is(true));
+        assertThat(GType.DOUBLE.isNumeric(), is(true));
+        assertThat(GType.LONG.isNumeric(), is(true));
+        assertThat(GType.BIG_INTEGER.isNumeric(), is(true));
+        assertThat(GType.BIG_DECIMAL.isNumeric(), is(true));
+    }
+
+    @Test
+    public void shouldReturnFalseForNonNumericTypes() {
+        assertThat(GType.STRING.isNumeric(), is(false));
+        assertThat(GType.BOOLEAN.isNumeric(), is(false));
+        assertThat(GType.EDGE.isNumeric(), is(false));
+        assertThat(GType.VERTEX.isNumeric(), is(false));
+    }
+
+    @Test
+    public void shouldReturnCorrectGType() {
+        assertEquals(GType.STRING, GType.getType("test"));
+        assertEquals(GType.INTEGER, GType.getType(123));
+        assertEquals(GType.BOOLEAN, GType.getType(true));
+        assertEquals(GType.DOUBLE, GType.getType(123.45));
+        assertEquals(GType.LONG, GType.getType(123L));
+        assertEquals(GType.MAP, GType.getType(Collections.emptyMap()));
+        assertEquals(GType.LIST, GType.getType(Collections.emptyList()));
+        assertEquals(GType.SET, GType.getType(Collections.emptySet()));
+        assertEquals(GType.VERTEX, GType.getType(mock(Vertex.class)));
+        assertEquals(GType.EDGE, GType.getType(mock(Edge.class)));
+        assertEquals(GType.PATH, GType.getType(mock(Path.class)));
+        assertEquals(GType.PROPERTY, GType.getType(mock(Property.class)));
+        assertEquals(GType.BIG_INTEGER, GType.getType(BigInteger.ONE));
+        assertEquals(GType.BIG_DECIMAL, GType.getType(BigDecimal.ONE));
+    }
+
+    @Test
+    public void shouldReturnUnknownForUnmatchedTypes() {
+        assertEquals(GType.UNKNOWN, GType.getType(new Object()));
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
new file mode 100644
index 0000000000..fcfac9b9d9
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -0,0 +1,316 @@
+/*
+ * 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.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+
+public class GValueTest {
+
+    @Test
+    public void shouldCreateGValueFromValue() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertEquals(123, gValue.get().intValue());
+        assertEquals(GType.INTEGER, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromNameAndValue() {
+        final GValue<Integer> gValue = GValue.of("varName", 123);
+        assertEquals(123, gValue.get().intValue());
+        assertEquals(GType.INTEGER, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromString() {
+        final GValue<String> gValue = GValue.ofString("test");
+        assertEquals("test", gValue.get());
+        assertEquals(GType.STRING, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromStringWithName() {
+        final GValue<String> gValue = GValue.ofString("varName", "test");
+        assertEquals("test", gValue.get());
+        assertEquals(GType.STRING, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromInteger() {
+        final GValue<Integer> gValue = GValue.ofInteger(123);
+        assertEquals(123, gValue.get().intValue());
+        assertEquals(GType.INTEGER, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromIntegerWithName() {
+        final GValue<Integer> gValue = GValue.ofInteger("varName", 123);
+        assertEquals(123, gValue.get().intValue());
+        assertEquals(GType.INTEGER, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBoolean() {
+        final GValue<Boolean> gValue = GValue.ofBoolean(true);
+        assertEquals(true, gValue.get());
+        assertEquals(GType.BOOLEAN, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBooleanWithName() {
+        final GValue<Boolean> gValue = GValue.ofBoolean("varName", true);
+        assertEquals(true, gValue.get());
+        assertEquals(GType.BOOLEAN, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromDouble() {
+        final GValue<Double> gValue = GValue.ofDouble(123.45);
+        assertEquals(123.45, gValue.get(), 0.0);
+        assertEquals(GType.DOUBLE, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromDoubleWithName() {
+        final GValue<Double> gValue = GValue.ofDouble("varName", 123.45);
+        assertEquals(123.45, gValue.get(), 0.0);
+        assertEquals(GType.DOUBLE, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBigInteger() {
+        final GValue<BigInteger> gValue = GValue.ofBigInteger(BigInteger.ONE);
+        assertEquals(BigInteger.ONE, gValue.get());
+        assertEquals(GType.BIG_INTEGER, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBigIntegerWithName() {
+        final GValue<BigInteger> gValue = GValue.ofBigInteger("varName", BigInteger.ONE);
+        assertEquals(BigInteger.ONE, gValue.get());
+        assertEquals(GType.BIG_INTEGER, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBigDecimal() {
+        final GValue<BigDecimal> gValue = GValue.ofBigDecimal(BigDecimal.ONE);
+        assertEquals(BigDecimal.ONE, gValue.get());
+        assertEquals(GType.BIG_DECIMAL, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromBigDecimalWithName() {
+        final GValue<BigDecimal> gValue = GValue.ofBigDecimal("varName", BigDecimal.ONE);
+        assertEquals(BigDecimal.ONE, gValue.get());
+        assertEquals(GType.BIG_DECIMAL, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromLong() {
+        final GValue<Long> gValue = GValue.ofLong(123L);
+        assertEquals(123L, gValue.get().longValue());
+        assertEquals(GType.LONG, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromLongWithName() {
+        final GValue<Long> gValue = GValue.ofLong("varName", 123L);
+        assertEquals(123L, gValue.get().longValue());
+        assertEquals(GType.LONG, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromMap() {
+        final Map<String, String> map = new HashMap<String,String>() {{
+            put("key", "value");
+        }};
+        final GValue<Map> gValue = GValue.ofMap(map);
+        assertEquals(map, gValue.get());
+        assertEquals(GType.MAP, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromMapWithName() {
+        final Map<String, String> map = new HashMap<String,String>() {{
+            put("key", "value");
+        }};
+        final GValue<Map> gValue = GValue.ofMap("varName", map);
+        assertEquals(map, gValue.get());
+        assertEquals(GType.MAP, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromList() {
+        final List<String> list = Arrays.asList("value1", "value2");
+        final GValue<List> gValue = GValue.ofList(list);
+        assertEquals(list, gValue.get());
+        assertEquals(GType.LIST, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromListWithName() {
+        final List<String> list = Arrays.asList("value1", "value2");
+        final GValue<List> gValue = GValue.ofList("varName", list);
+        assertEquals(list, gValue.get());
+        assertEquals(GType.LIST, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromSet() {
+        final Set<String> set = new HashSet<>(Arrays.asList("value1", "value2"));
+        final GValue<Set> gValue = GValue.ofSet(set);
+        assertEquals(set, gValue.get());
+        assertEquals(GType.SET, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromSetWithName() {
+        final Set<String> set = new HashSet<>(Arrays.asList("value1", "value2"));
+        final GValue<Set> gValue = GValue.ofSet("varName", set);
+        assertEquals(set, gValue.get());
+        assertEquals(GType.SET, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromVertex() {
+        final Vertex vertex = mock(Vertex.class);
+        final GValue<Vertex> gValue = GValue.ofVertex(vertex);
+        assertEquals(vertex, gValue.get());
+        assertEquals(GType.VERTEX, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromVertexWithName() {
+        final Vertex vertex = mock(Vertex.class);
+        final GValue<Vertex> gValue = GValue.ofVertex("varName", vertex);
+        assertEquals(vertex, gValue.get());
+        assertEquals(GType.VERTEX, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromEdge() {
+        final Edge edge = mock(Edge.class);
+        final GValue<Edge> gValue = GValue.ofEdge(edge);
+        assertEquals(edge, gValue.get());
+        assertEquals(GType.EDGE, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromEdgeWithName() {
+        final Edge edge = mock(Edge.class);
+        final GValue<Edge> gValue = GValue.ofEdge("varName", edge);
+        assertEquals(edge, gValue.get());
+        assertEquals(GType.EDGE, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromPath() {
+        final Path path = mock(Path.class);
+        final GValue<Path> gValue = GValue.ofPath(path);
+        assertEquals(path, gValue.get());
+        assertEquals(GType.PATH, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromPathWithName() {
+        final Path path = mock(Path.class);
+        final GValue<Path> gValue = GValue.ofPath("varName", path);
+        assertEquals(path, gValue.get());
+        assertEquals(GType.PATH, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+
+    @Test
+    public void shouldCreateGValueFromProperty() {
+        final Property property = mock(Property.class);
+        final GValue<Property> gValue = GValue.ofProperty(property);
+        assertEquals(property, gValue.get());
+        assertEquals(GType.PROPERTY, gValue.getType());
+        assertThat(gValue.isVariable(), is(false));
+    }
+
+    @Test
+    public void shouldCreateGValueFromPropertyWithName() {
+        final Property property = mock(Property.class);
+        final GValue<Property> gValue = GValue.ofProperty("varName", property);
+        assertEquals(property, gValue.get());
+        assertEquals(GType.PROPERTY, gValue.getType());
+        assertEquals("varName", gValue.getName().get());
+        assertThat(gValue.isVariable(), is(true));
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
index 0983540dcb..f509926359 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.junit.Test;
 
@@ -356,4 +357,14 @@ public class ParametersTest {
 
         verify(mock).integrateChild(__.outE("knows").asAdmin());
     }
+
+    @Test
+    public void shouldGetKeyValuesAndResolveGValues() {
+        final Parameters parameters = new Parameters();
+        parameters.set(null, "a", "axe", "b", GValue.of("B", "bat"), "c", GValue.of("C", "cat"));
+
+        final Object[] params = parameters.getKeyValues(mock(Traverser.Admin.class));
+        assertEquals(6, params.length);
+        assertThat(Arrays.equals(new Object[] {"a", "axe", "b", "bat", "c", "cat"}, params), is(true));
+    }
 }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 80111709f5..e1d908045b 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -18,8 +18,12 @@
  */
 package org.apache.tinkerpop.gremlin.tinkergraph.structure;
 
+import org.apache.tinkerpop.gremlin.jsr223.GremlinLangScriptEngine;
+import org.apache.tinkerpop.gremlin.jsr223.VariableResolverCustomizer;
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
 import org.apache.tinkerpop.gremlin.process.computer.Computer;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -38,6 +42,7 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.script.Bindings;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.BiFunction;
@@ -270,17 +275,25 @@ public class TinkerGraphPlayTest {
     }
 
     @Test
-    @Ignore
-    public void testBugs() {
+    public void testBugs() throws Exception {
         final GraphTraversalSource g = TinkerFactory.createModern().traversal();
-        Object o1 = g.V().map(__.V(1));
-        System.out.println(g.V().as("a").both().as("b").dedup("a", "b").by(T.label).select("a", "b").explain());
-        System.out.println(g.V().as("a").both().as("b").dedup("a", "b").by(T.label).select("a", "b").toList());
-
-        Traversal<?,?> t =
-                g.V("3").
-                        union(__.repeat(out().simplePath()).times(2).count(),
-                                __.repeat(in().simplePath()).times(2).count());
+        final GremlinLangScriptEngine se = new GremlinLangScriptEngine(
+                new VariableResolverCustomizer(VariableResolver.DefaultVariableResolver::new));
+
+        final Bindings b = se.createBindings();
+        b.put("g", g);
+        System.out.println(((GraphTraversal) se.eval("g.V().coin(0.5).count()", b)).toList());
+
+        b.clear();
+        b.put("g", g);
+        b.put("x", 0.5d);
+        System.out.println(((GraphTraversal) se.eval("g.V().coin(x).count()", b)).toList());
+
+        b.clear();
+        b.put("g", g);
+        b.put("x", "josh");
+        b.put("y", 32);
+        System.out.println(((GraphTraversal) se.eval("g.V().has('name', x).has('age', y).count()", b)).toList());
     }
 
     @Test


(tinkerpop) 19/20: wip

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 05ea46fa44966f0d271f1e18c872a43d44f02eac
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 28 11:53:45 2024 -0400

    wip
---
 .../traversal/dsl/graph/GraphTraversal.java        |   4 -
 .../gremlin/test/features/map/Edge.feature         | 261 ++++++++++++++++++++-
 .../gremlin/test/features/map/Vertex.feature       | 248 +-------------------
 3 files changed, 261 insertions(+), 252 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 572c46f52b..a780f742a3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -238,10 +238,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * Exposes administrative methods that are either internal to TinkerPop or for users with advanced needs. This
      * separation helps keep the Gremlin API more concise. Any {@code GraphTraversal} can get an instance of its
      * administrative form by way of {@link GraphTraversal#asAdmin()}.
-     * <p/>
-     * Note that step overloads allowing use of {@link GValue} objects do not construct bytecode with that object.
-     * Bytecode does not make use of parameterization in that fashion so it there isn't a need to really preserve that
-     * functionality there (doing so would require changes to serializers).
      */
     public interface Admin<S, E> extends Traversal.Admin<S, E>, GraphTraversal<S, E> {
 
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature
index f3d92320d2..7d75a251af 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature
@@ -16,7 +16,117 @@
 # under the License.
 
 @StepClassMap @StepE
-Feature: Step - E()
+Feature: Step - E(), inV(), outV(), bothV(), otherV()
+
+  Scenario: g_E
+    Given the modern graph
+    And the traversal of
+      """
+      g.E()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[marko-created->lop] |
+      | e[marko-knows->josh] |
+      | e[marko-knows->vadas] |
+      | e[peter-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->ripple] |
+
+  Scenario: g_EX11X
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].id"
+    And the traversal of
+      """
+      g.E(eid11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+
+  Scenario: g_EX11AsStringX
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].sid"
+    And the traversal of
+      """
+      g.E(eid11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+
+  Scenario: g_EXe11X
+    Given the modern graph
+    And using the parameter e11 defined as "e[josh-created->lop]"
+    And the traversal of
+      """
+      g.E(e11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+
+  Scenario: g_EXe7_e11X
+    Given the modern graph
+    And using the parameter e7 defined as "e[marko-knows->vadas]"
+    And using the parameter e11 defined as "e[josh-created->lop]"
+    And the traversal of
+      """
+      g.E(e7,e11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[marko-knows->vadas] |
+      | e[josh-created->lop] |
+
+  Scenario: g_EXlistXe7_e11XX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[e[marko-knows->vadas],e[josh-created->lop]]"
+    And the traversal of
+      """
+      g.E(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[marko-knows->vadas] |
+      | e[josh-created->lop] |
+
+  Scenario: g_EXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.E(null)
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_EXlistXnullXX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[null]"
+    And the traversal of
+      """
+      g.E(xx1)
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_EX11_nullX
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].id"
+    And the traversal of
+      """
+      g.E(eid11,null)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
 
   Scenario: g_V_EX11X
     Given the modern graph
@@ -97,3 +207,152 @@ Feature: Step - E()
     When iterated to list
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.E().hasLabel(\"tests\")"
+
+  Scenario: g_VX1X_outE_inV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE().inV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
+      | v[lop] |
+
+  Scenario: g_VX2X_inE_outV
+    Given the modern graph
+    And using the parameter vid2 defined as "v[vadas].id"
+    And the traversal of
+      """
+      g.V(vid2).inE().outV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[marko] |
+
+  Scenario: g_V_outE_hasXweight_1X_outV
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().outE().has("weight",1.0).outV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[marko] |
+      | v[josh] |
+
+  Scenario: g_VX1X_outE_otherV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE().otherV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
+      | v[lop] |
+
+  Scenario: g_VX4X_bothE_otherV
+    Given the modern graph
+    And using the parameter vid4 defined as "v[josh].id"
+    And the traversal of
+      """
+      g.V(vid4).bothE().otherV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[marko] |
+      | v[ripple] |
+      | v[lop] |
+
+  Scenario: g_VX4X_bothE_hasXweight_lt_1X_otherV
+    Given the modern graph
+    And using the parameter vid4 defined as "v[josh].id"
+    And the traversal of
+      """
+      g.V(vid4).bothE().has("weight", P.lt(1.0)).otherV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[lop] |
+
+  Scenario: get_g_VX1X_outE_otherV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE().otherV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
+      | v[lop] |
+
+  Scenario: g_VX1X_outEXknowsX_inV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE("knows").inV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
+
+  Scenario: g_VX1X_outEXknows_createdX_inV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE("knows","created").inV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
+      | v[lop] |
+
+  Scenario: g_VX1X_outEXknowsX_bothV
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE("knows").bothV()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[marko] |
+      | v[marko] |
+      | v[josh] |
+      | v[vadas] |
+
+  Scenario: g_VX1X_outEXknowsX_bothV_name
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE("knows").bothV().values("name")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | marko |
+      | josh |
+      | vadas |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Vertex.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Vertex.feature
index f0b3c95a93..3f8912211b 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Vertex.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Vertex.feature
@@ -16,7 +16,7 @@
 # under the License.
 
 @StepClassMap @StepVertex
-Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
+Feature: Step - V(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VXnullX
     Given the modern graph
@@ -147,116 +147,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | v[lop] |
       | v[ripple] |
 
-  Scenario: g_E
-    Given the modern graph
-    And the traversal of
-      """
-      g.E()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[marko-created->lop] |
-      | e[marko-knows->josh] |
-      | e[marko-knows->vadas] |
-      | e[peter-created->lop] |
-      | e[josh-created->lop] |
-      | e[josh-created->ripple] |
-
-  Scenario: g_EX11X
-    Given the modern graph
-    And using the parameter eid11 defined as "e[josh-created->lop].id"
-    And the traversal of
-      """
-      g.E(eid11)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[josh-created->lop] |
-
-  Scenario: g_EX11AsStringX
-    Given the modern graph
-    And using the parameter eid11 defined as "e[josh-created->lop].sid"
-    And the traversal of
-      """
-      g.E(eid11)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[josh-created->lop] |
-
-  Scenario: g_EXe11X
-    Given the modern graph
-    And using the parameter e11 defined as "e[josh-created->lop]"
-    And the traversal of
-      """
-      g.E(e11)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[josh-created->lop] |
-
-  Scenario: g_EXe7_e11X
-    Given the modern graph
-    And using the parameter e7 defined as "e[marko-knows->vadas]"
-    And using the parameter e11 defined as "e[josh-created->lop]"
-    And the traversal of
-      """
-      g.E(e7,e11)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[marko-knows->vadas] |
-      | e[josh-created->lop] |
-
-  Scenario: g_EXlistXe7_e11XX
-    Given the modern graph
-    And using the parameter xx1 defined as "l[e[marko-knows->vadas],e[josh-created->lop]]"
-    And the traversal of
-      """
-      g.E(xx1)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[marko-knows->vadas] |
-      | e[josh-created->lop] |
-
-  Scenario: g_EXnullX
-    Given the modern graph
-    And the traversal of
-      """
-      g.E(null)
-      """
-    When iterated to list
-    Then the result should be empty
-
-  Scenario: g_EXlistXnullXX
-    Given the modern graph
-    And using the parameter xx1 defined as "l[null]"
-    And the traversal of
-      """
-      g.E(xx1)
-      """
-    When iterated to list
-    Then the result should be empty
-
-  Scenario: g_EX11_nullX
-    Given the modern graph
-    And using the parameter eid11 defined as "e[josh-created->lop].id"
-    And the traversal of
-      """
-      g.E(eid11,null)
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | e[josh-created->lop] |
-
   Scenario: g_VX1X_outE
     Given the modern graph
     And using the parameter vid1 defined as "v[marko].id"
@@ -310,44 +200,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | e[josh-created->ripple] |
       | e[marko-knows->josh] |
 
-  Scenario: g_VX1X_outE_inV
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).both()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[vadas] |
-      | v[josh] |
-      | v[lop] |
-
-  Scenario: g_VX2X_inE_outV
-    Given the modern graph
-    And using the parameter vid2 defined as "v[vadas].id"
-    And the traversal of
-      """
-      g.V(vid2).inE().outV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[marko] |
-
-  Scenario: g_V_outE_hasXweight_1X_outV
-    Given the modern graph
-    And the traversal of
-      """
-      g.V().outE().has("weight",1.0).outV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[marko] |
-      | v[josh] |
-
   Scenario: g_V_out_outE_inV_inE_inV_both_name
     Given the modern graph
     And the traversal of
@@ -368,61 +220,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | peter |
       | peter |
 
-  Scenario: g_VX1X_outEXknowsX_bothV_name
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).outE("knows").bothV().values("name")
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | marko |
-      | marko |
-      | josh |
-      | vadas |
-
-  Scenario: g_VX1X_outE_otherV
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).outE().otherV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[vadas] |
-      | v[josh] |
-      | v[lop] |
-
-  Scenario: g_VX4X_bothE_otherV
-    Given the modern graph
-    And using the parameter vid4 defined as "v[josh].id"
-    And the traversal of
-      """
-      g.V(vid4).bothE().otherV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[marko] |
-      | v[ripple] |
-      | v[lop] |
-
-  Scenario: g_VX4X_bothE_hasXweight_lt_1X_otherV
-    Given the modern graph
-    And using the parameter vid4 defined as "v[josh].id"
-    And the traversal of
-      """
-      g.V(vid4).bothE().has("weight", P.lt(1.0)).otherV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[lop] |
-
   Scenario: g_VX2X_inE
     Given the modern graph
     And using the parameter vid2 defined as "v[vadas].id"
@@ -435,20 +232,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | result |
       | e[marko-knows->vadas] |
 
-  Scenario: get_g_VX1X_outE_otherV
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).outE().otherV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[vadas] |
-      | v[josh] |
-      | v[lop] |
-
   Scenario: g_VX1X_outXknowsX
     Given the modern graph
     And using the parameter vid1 defined as "v[marko].id"
@@ -489,33 +272,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | v[josh] |
       | v[lop] |
 
-  Scenario: g_VX1X_outEXknowsX_inV
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).outE("knows").inV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[vadas] |
-      | v[josh] |
-
-  Scenario: g_VX1X_outEXknows_createdX_inV
-    Given the modern graph
-    And using the parameter vid1 defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(vid1).outE("knows","created").inV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[vadas] |
-      | v[josh] |
-      | v[lop] |
-
   Scenario: g_V_out_out
     Given the modern graph
     And the traversal of
@@ -565,8 +321,6 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       | v[vadas] |
       | v[josh] |
 
-
-
   # the point here is to test g.V() where an id is not present. to do this with the gherkin structure
   # the test establishes the modern graph, does a drop() of "lop" and then tries to query the 4 vertices
   # and we assert the count of 3


(tinkerpop) 13/20: wip - fixup after rebase

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e329a7bcc3de2a482851e69013ab4e878579d7e3
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Aug 26 15:15:20 2024 -0400

    wip - fixup after rebase
---
 .../process/traversal/dsl/graph/GraphTraversal.java   |  4 ++--
 .../process/traversal/step/map/MergeElementStep.java  | 14 +++++++++++---
 .../gremlin/process/traversal/step/map/MergeStep.java | 19 ++++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 375a9993b8..6342c981c6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -590,13 +590,13 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         /**
          * Merges the list traverser and list argument. Also known as union.
          *
-         * @return the traversal with an appended {@link TraversalMergeStep}.
+         * @return the traversal with an appended {@link MergeStep}.
          * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
          * @since 3.7.3
          */
         public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
             this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
-            return this.asAdmin().addStep(new TraversalMergeStep<>(this.asAdmin(), values));
+            return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
         }
 
         /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
index 44e954fb31..6835387c5e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
@@ -35,6 +35,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Deleting;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
@@ -80,6 +82,11 @@ public abstract class MergeElementStep<S, E, C> extends FlatMapStep<S, E>
         validate(mergeMap, false);
     }
 
+    public MergeElementStep(final Traversal.Admin traversal, final boolean isStart, final GValue<Map> mergeMap) {
+        this(traversal, isStart, new ConstantTraversal<>(mergeMap));
+        validate(mergeMap.get(), false);
+    }
+
     public MergeElementStep(final Traversal.Admin traversal, final boolean isStart,
                             final Traversal.Admin mergeTraversal) {
         super(traversal);
@@ -279,7 +286,7 @@ public abstract class MergeElementStep<S, E, C> extends FlatMapStep<S, E>
                             op, allowedTokens, k));
                 }
                 if (k == T.label) {
-                    if (!(v instanceof String)) {
+                    if (!(GValue.instanceOf(v, GType.STRING))) {
                         throw new IllegalArgumentException(String.format(
                                 "%s() and option(onCreate) args expect T.label value to be of String - found: %s", op,
                                 v.getClass().getSimpleName()));
@@ -318,7 +325,8 @@ public abstract class MergeElementStep<S, E, C> extends FlatMapStep<S, E>
      * null Map == empty Map
      */
     protected Map materializeMap(final Traverser.Admin<S> traverser, Traversal.Admin<S, ?> mapTraversal) {
-        Map map = (Map) TraversalUtil.apply(traverser, mapTraversal);
+        final Object o = TraversalUtil.apply(traverser, mapTraversal);
+        Map map = GValue.getFrom(o);
 
         // PartitionStrategy uses parameters as a mechanism for setting the partition key. trying to be as specific
         // as possible here wrt parameters usage to avoid misuse
@@ -360,7 +368,7 @@ public abstract class MergeElementStep<S, E, C> extends FlatMapStep<S, E>
         return id != null ? graph.traversal().V(id) : graph.traversal().V();
     }
 
-    protected GraphTraversal searchVerticesLabelConstraint(GraphTraversal t, final String label) {
+    protected GraphTraversal searchVerticesLabelConstraint(final GraphTraversal t, final String label) {
         return label != null ? t.hasLabel(label) : t;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
index d11fdf0894..e40d11c71b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -40,7 +41,7 @@ import java.util.Set;
  */
 public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
 
     public MergeStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
@@ -48,10 +49,18 @@ public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements Traver
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = GValue.of(values);;
         }
     }
 
+    public Traversal.Admin<S, E> getValueTraversal() {
+        return valueTraversal;
+    }
+
+    public GValue<Object> getParameterItems() {
+        return parameterItems;
+    }
+
     @Override
     public String getStepName() { return "merge"; }
 
@@ -61,7 +70,7 @@ public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements Traver
 
         final Map mapA = (incoming instanceof Map) ? (Map) incoming : null;
         if (mapA != null) {
-            final Object mapB = (valueTraversal != null) ? TraversalUtil.apply(traverser, valueTraversal) : parameterItems;
+            final Object mapB = (valueTraversal != null) ? TraversalUtil.apply(traverser, valueTraversal) : parameterItems.get();
             if (!(mapB instanceof Map)) {
                 throw new IllegalArgumentException(
                         String.format(
@@ -76,13 +85,13 @@ public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements Traver
         } else {
             final Collection listA = convertTraverserToCollection(traverser);
 
-            if (parameterItems instanceof Map) {
+            if (parameterItems != null && parameterItems.get() instanceof Map) {
                 throw new IllegalArgumentException(getStepName() + " step type mismatch: expected argument to be Iterable but got Map");
             }
             final Collection listB =
                     (null != valueTraversal)
                             ? convertTraversalToCollection(traverser, valueTraversal)
-                            : convertArgumentToCollection(parameterItems);
+                            : convertArgumentToCollection(parameterItems.get());
 
             final Set elements = new HashSet();
 


(tinkerpop) 16/20: wip - removed admin interface methods - doesn't work nice

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c9e6744b7289e12f45ecfb6e5f25d533e9b3e691
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Aug 27 12:38:32 2024 -0400

    wip - removed admin interface methods - doesn't work nice
---
 .../traversal/dsl/graph/GraphTraversal.java        | 867 +++++++++------------
 .../traversal/dsl/graph/GraphTraversalSource.java  | 105 +--
 .../gremlin/process/traversal/dsl/graph/__.java    | 114 +++
 .../gremlin/process/traversal/step/GValue.java     |  42 +
 .../process/traversal/step/map/GraphStep.java      |  10 +-
 .../process/traversal/step/map/VertexStep.java     |  16 +-
 .../traversal/step/sideEffect/InjectStep.java      |   8 +-
 .../process/traversal/step/util/AbstractStep.java  |  44 --
 .../optimization/InlineFilterStrategy.java         |   2 +-
 .../tinkerpop/gremlin/util/CollectionUtil.java     |  21 +
 10 files changed, 597 insertions(+), 632 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 5cf66f4d6c..5f6825acdc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -205,8 +205,10 @@ import org.apache.tinkerpop.gremlin.structure.PropertyType;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
 
+import java.lang.reflect.Array;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -243,463 +245,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      */
     public interface Admin<S, E> extends Traversal.Admin<S, E>, GraphTraversal<S, E> {
 
-        /**
-         * Filter the <code>E</code> object given a biased coin toss. For internal use for  parameterization features.
-         *
-         * @param probability the probability that the object will pass through the filter
-         * @return the traversal with an appended {@link CoinStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#coin-step" target="_blank">Reference Documentation - Coin Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, E> coin(final GValue<Double> probability) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.coin, probability);
-            return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
-        }
-
-        /**
-         * Map any object to a fixed <code>E</code> value. For internal use for  parameterization features.
-         *
-         * @return the traversal with an appended {@link ConstantStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#constant-step" target="_blank">Reference Documentation - Constant Step</a>
-         * @since 3.7.3
-         */
-        public default <E2> GraphTraversal<S, E2> constant(final GValue<E2> e) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.constant, e);
-            return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
-        }
-
-        /**
-         * Map the {@link Vertex} to its adjacent vertices given a direction and edge labels. The arguments for the
-         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param direction  the direction to traverse from the current vertex
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> to(final Direction direction, final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its outgoing adjacent vertices given the edge labels. The arguments for the
-         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> out(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its incoming adjacent vertices given the edge labels. The arguments for the
-         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> in(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its adjacent vertices given the edge labels. The arguments for the labels must be
-         * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> both(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its incident edges given the direction and edge labels. The arguments for the
-         * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param direction  the direction to traverse from the current vertex
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> toE(final Direction direction, final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its outgoing incident edges given the edge labels. The arguments for the labels
-         * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> outE(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its incoming incident edges given the edge labels. The arguments for the labels
-         * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> inE(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, edgeLabels));
-        }
-
-        /**
-         * Map the {@link Vertex} to its incident edges given the edge labels. The arguments for the labels must be
-         * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
-         *
-         * @param edgeLabels the edge labels to traverse
-         * @return the traversal with an appended {@link VertexStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> bothE(final Object... edgeLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, edgeLabels);
-            return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, edgeLabels));
-        }
-
-        /**
-         * Adds a {@link Vertex}.
-         *
-         * @param vertexLabel the label of the {@link Vertex} to add
-         * @return the traversal with the {@link AddVertexStep} added
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addvertex-step" target="_blank">Reference Documentation - AddVertex Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> addV(final GValue<String> vertexLabel) {
-            if (null == vertexLabel || null == vertexLabel.get()) throw new IllegalArgumentException("vertexLabel cannot be null");
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addV, vertexLabel);
-            return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabel));
-        }
-
-        /**
-         * Performs a merge (i.e. upsert) style operation for an {@link Vertex} using a {@code Map} as an argument.
-         * The {@code Map} represents search criteria and will match each of the supplied key/value pairs where the keys
-         * may be {@code String} property values or a value of {@link T}. If a match is not made it will use that search
-         * criteria to create the new {@link Vertex}.
-         *
-         * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeV, searchCreate);
-            final MergeVertexStep<S> step = new MergeVertexStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
-            return this.asAdmin().addStep(step);
-        }
-
-        /**
-         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
-         * {@code Map} as an argument.
-         *
-         * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
-            // get a construction time exception if the Map is bad
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeE, searchCreate);
-            final MergeEdgeStep<S> step = new MergeEdgeStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
-            return this.asAdmin().addStep(step);
-        }
-
-        /**
-         * Adds an {@link Edge} with the specified edge label.
-         *
-         * @param edgeLabel the label of the newly added edge
-         * @return the traversal with the {@link AddEdgeStep} added
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - AddEdge Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Edge> addE(final GValue<String> edgeLabel) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addE, edgeLabel);
-            return this.asAdmin().addStep(new AddEdgeStep<>(this.asAdmin(), edgeLabel));
-        }
-
-        /**
-         * Filters vertices, edges and vertex properties based on their label.
-         *
-         * @param label       the label of the {@link Element}
-         * @param otherLabels additional labels of the {@link Element}
-         * @return the traversal with an appended {@link HasStep}
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
-         * @since 3.2.2
-         */
-        public default GraphTraversal<S, E> hasLabel(final GValue<String> label, final GValue<String>... otherLabels) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
-
-            // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
-            // do this but the failure is ugly if not handled.
-            final int otherLabelsLength = null == otherLabels ? 0 : otherLabels.length;
-            final Object[] labels = new Object[otherLabelsLength + 1];
-            labels[0] = label;
-            if (otherLabelsLength > 0)
-                System.arraycopy(otherLabels, 0, labels, 1, otherLabelsLength);
-            return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), labels.length == 1 ? P.eq(labels[0]) : P.within(labels)));
-        }
-
-        /**
-         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
-         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
-         * the documentation of such steps to understand the usage context.
-         *
-         * @param token       the token that would trigger this option which may be a {@link Pick}, {@link Merge},
-         *                    a {@link Traversal}, {@link Predicate}, or object depending on the step being modulated.
-         * @param traversalOption the option as a traversal
-         * @return the traversal with the modulated step
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step" target="_blank">Reference Documentation - Choose Step</a>
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
-         * @since 3.0.0-incubating
-         */
-        public default <M, E2> GraphTraversal<S, E> option(final GValue<M> token, final Traversal<?, E2> traversalOption) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, traversalOption);
-
-            // handle null similar to how option() with Map handles it, otherwise we get a NPE if this one gets used
-            final Traversal.Admin<E,E2> t = null == traversalOption ?
-                    new ConstantTraversal<>(null) : (Traversal.Admin<E, E2>) traversalOption.asAdmin();
-            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token.get(), t);
-            return this;
-        }
-
-        /**
-         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
-         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
-         * the documentation of such steps to understand the usage context.
-         *
-         * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
-         * @return the traversal with the modulated step
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
-         * @since 3.7.3
-         */
-        public default <M, E2> GraphTraversal<S, E> option(final M token, final GValue<Map<Object, Object>> m) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m);
-            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
-            return this;
-        }
-
-        /**
-         * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
-         * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
-         * the documentation of such steps to understand the usage context.
-         *
-         * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
-         * @return the traversal with the modulated step
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
-         * @since 3.7.3
-         */
-        public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final GValue<Map<Object, Object>> m, final VertexProperty.Cardinality cardinality) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, merge, m, cardinality);
-
-            final Map<Object, Object> map = m.get();
-
-            // do explicit cardinality for every single pair in the map
-            for (Object k : map.keySet()) {
-                final Object o = map.get(k);
-                if (!(o instanceof CardinalityValueTraversal))
-                    map.put(k, new CardinalityValueTraversal(cardinality, o));
-            }
-            ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption((M) merge, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
-            return this;
-        }
-
-        /**
-         * Combines the list traverser and list argument. Also known as concatenation or append.
-         *
-         * @return the traversal with an appended {@link CombineStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#combine-step" target="_blank">Reference Documentation - Combine Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, List<?>> combine(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.combine, values);
-            return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * Joins together the elements of the incoming list traverser together with the provided delimiter.
-         *
-         * @return the traversal with an appended {@link ConjoinStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#conjoin-step" target="_blank">Reference Documentation - Conjoin Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, String> conjoin(final GValue<String> delimiter) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.conjoin, delimiter);
-            return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
-        }
-
-        /**
-         * Calculates the difference between the list traverser and list argument.
-         *
-         * @return the traversal with an appended {@link DifferenceStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#difference-step" target="_blank">Reference Documentation - Difference Step</a>
-         * @since 3.7.1
-         */
-        public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values);
-            return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * Calculates the disjunction between the list traverser and list argument.
-         *
-         * @return the traversal with an appended {@link DisjunctStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#disjunct-step" target="_blank">Reference Documentation - Disjunct Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values);
-            return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * Calculates the intersection between the list traverser and list argument.
-         *
-         * @return the traversal with an appended {@link IntersectStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#intersect-step" target="_blank">Reference Documentation - Intersect Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values);
-            return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * Merges the list traverser and list argument. Also known as union.
-         *
-         * @return the traversal with an appended {@link MergeStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
-         * @since 3.7.3
-         */
-        public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
-            return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * Calculates the cartesian product between the list traverser and list argument.
-         *
-         * @return the traversal with an appended {@link ProductStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#product-step" target="_blank">Reference Documentation - Product Step</a>
-         * @since 3.7.3
-         */
-        public default GraphTraversal<S, List<List<?>>> product(final GValue<Object> values) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.product, values);
-            return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
-        }
-
-        /**
-         * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
-         * incoming vertex of the newly added {@link Edge}.
-         *
-         * @param toVertex the vertex for selecting the incoming vertex
-         * @return the traversal with the modified {@link AddEdgeStep}
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
-         * @since 4.0.0
-         */
-        public default GraphTraversal<S, E> to(final GValue<Vertex> toVertex) {
-            final Step<?,?> prev = this.asAdmin().getEndStep();
-            if (!(prev instanceof FromToModulating))
-                throw new IllegalArgumentException(String.format(
-                        "The to() step cannot follow %s", prev.getClass().getSimpleName()));
-
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, toVertex);
-            ((FromToModulating) prev).addTo(__.constant(toVertex).asAdmin());
-            return this;
-        }
-
-        /**
-         * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
-         * outgoing vertex of the newly added {@link Edge}.
-         *
-         * @param fromVertex the vertex for selecting the outgoing vertex
-         * @return the traversal with the modified {@link AddEdgeStep}
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
-         * @since 4.0.0
-         */
-        public default GraphTraversal<S, E> from(final GValue<Vertex> fromVertex) {
-            final Step<?,?> prev = this.asAdmin().getEndStep();
-            if (!(prev instanceof FromToModulating))
-                throw new IllegalArgumentException(String.format(
-                        "The from() step cannot follow %s", prev.getClass().getSimpleName()));
-
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.from, fromVertex);
-            ((FromToModulating) prev).addFrom(__.constant(fromVertex).asAdmin());
-            return this;
-        }
-
-        /**
-         * Perform the specified service call with the specified static parameters.
-         *
-         * @param service the name of the service call
-         * @param params static parameter map (no nested traversals)
-         * @return the traversal with an appended {@link CallStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
-         * @since 4.0.0
-         */
-        default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params);
-            final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params);
-            return this.asAdmin().addStep(call);
-        }
-        /**
-         * Perform the specified service call with both static and dynamic parameters produced by the specified child
-         * traversal. These parameters will be merged at execution time per the provider implementation. Reference
-         * implementation merges dynamic into static (dynamic will overwrite static).
-         *
-         * @param service the name of the service call
-         * @param params static parameter map (no nested traversals)
-         * @param childTraversal a traversal that will produce a Map of parameters for the service call when invoked.
-         * @return the traversal with an appended {@link CallStep}.
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
-         * @since 4.0.0
-         */
-        default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
-            final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service, params) :
-                    new CallStep(this.asAdmin(), false, service, params, childTraversal.asAdmin());
-            return this.asAdmin().addStep(step);
-        }
-
-        /**
-         * Filters vertices, edges and vertex properties based on their properties.
-         *
-         * @param label       the label of the {@link Element}
-         * @param propertyKey the key of the property to filter on
-         * @param value       the value to compare the accessor value to for equality
-         * @return the traversal with an appended {@link HasStep}
-         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
-         * @since 4.0.0
-         */
-        public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final Object value) {
-            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value);
-            TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
-            return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, value instanceof P ? (P) value : P.eq(value)));
-        }
-
         @Override
         public default <E2> GraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
             return (GraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
@@ -824,6 +369,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
     }
 
+    /**
+     * Map any object to a fixed <code>E</code> value. For internal use for  parameterization features.
+     *
+     * @return the traversal with an appended {@link ConstantStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#constant-step" target="_blank">Reference Documentation - Constant Step</a>
+     * @since 4.0.0
+     */
+    public default <E2> GraphTraversal<S, E2> constant(final GValue<E2> e) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.constant, e);
+        return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e));
+    }
+
     /**
      * A {@code V} step is usually used to start a traversal but it may also be used mid-traversal.
      *
@@ -868,6 +425,22 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its adjacent vertices given a direction and edge labels. The arguments for the
+     * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param direction  the direction to traverse from the current vertex
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Vertex> to(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabel, edgeLabels);
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its outgoing adjacent vertices given the edge labels.
      *
@@ -881,6 +454,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its outgoing adjacent vertices given the edge labels. The arguments for the
+     * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.7.3
+     */
+    public default GraphTraversal<S, Vertex> out(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its incoming adjacent vertices given the edge labels.
      *
@@ -894,6 +482,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its incoming adjacent vertices given the edge labels. The arguments for the
+     * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Vertex> in(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its adjacent vertices given the edge labels.
      *
@@ -907,6 +510,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its adjacent vertices given the edge labels. The arguments for the labels must be
+     * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Vertex> both(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its incident edges given the direction and edge labels.
      *
@@ -921,6 +539,23 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, edgeLabels));
     }
 
+
+    /**
+     * Map the {@link Vertex} to its incident edges given the direction and edge labels. The arguments for the
+     * labels must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param direction  the direction to traverse from the current vertex
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> toE(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabel, edgeLabels);
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its outgoing incident edges given the edge labels.
      *
@@ -934,6 +569,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its outgoing incident edges given the edge labels. The arguments for the labels
+     * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> outE(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, labels));
+    }
+
     /**
      * Map the {@link Vertex} to its incoming incident edges given the edge labels.
      *
@@ -947,6 +597,22 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its incoming incident edges given the edge labels. The arguments for the labels
+     * must be either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> inE(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, labels));
+    }
+
+
     /**
      * Map the {@link Vertex} to its incident edges given the edge labels.
      *
@@ -960,6 +626,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, edgeLabels));
     }
 
+    /**
+     * Map the {@link Vertex} to its incident edges given the edge labels. The arguments for the labels must be
+     * either a {@code String} or a {@link GValue<String>}. For internal use for  parameterization.
+     *
+     * @param edgeLabels the edge labels to traverse
+     * @return the traversal with an appended {@link VertexStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps" target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> bothE(final GValue<String> label, final GValue<String>... edgeLabels) {
+        final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class);
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, label, edgeLabels);
+        return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, labels));
+    }
+
     /**
      * Map the {@link Edge} to its incident vertices given the direction.
      *
@@ -1589,6 +1270,20 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabelTraversal.asAdmin()));
     }
 
+    /**
+     * Adds a {@link Vertex}.
+     *
+     * @param vertexLabel the label of the {@link Vertex} to add
+     * @return the traversal with the {@link AddVertexStep} added
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addvertex-step" target="_blank">Reference Documentation - AddVertex Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Vertex> addV(final GValue<String> vertexLabel) {
+        if (null == vertexLabel || null == vertexLabel.get()) throw new IllegalArgumentException("vertexLabel cannot be null");
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addV, vertexLabel);
+        return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabel));
+    }
+
     /**
      * Adds a {@link Vertex} with a default vertex label.
      *
@@ -1647,6 +1342,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(step);
     }
 
+    /**
+     * Performs a merge (i.e. upsert) style operation for an {@link Vertex} using a {@code Map} as an argument.
+     * The {@code Map} represents search criteria and will match each of the supplied key/value pairs where the keys
+     * may be {@code String} property values or a value of {@link T}. If a match is not made it will use that search
+     * criteria to create the new {@link Vertex}.
+     *
+     * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+        final MergeVertexStep<S> step = new MergeVertexStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
+        return this.asAdmin().addStep(step);
+    }
+
     /**
      * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using an
      * incoming {@code Map} as an argument.
@@ -1688,6 +1398,20 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(step);
     }
 
+    /**
+     * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
+     * {@code Map} as an argument.
+     *
+     * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
+        // get a construction time exception if the Map is bad
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+        final MergeEdgeStep<S> step = new MergeEdgeStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate);
+        return this.asAdmin().addStep(step);
+    }
+
     /**
      * Adds an {@link Edge} with the specified edge label.
      *
@@ -1714,21 +1438,35 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     }
 
     /**
-     * Provide {@code to()}-modulation to respective steps.
+     * Adds an {@link Edge} with the specified edge label.
      *
-     * @param toStepLabel the step label to modulate to.
-     * @return the traversal with the modified {@link FromToModulating} step.
-     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#to-step" target="_blank">Reference Documentation - To Step</a>
+     * @param edgeLabel the label of the newly added edge
+     * @return the traversal with the {@link AddEdgeStep} added
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Edge> addE(final GValue<String> edgeLabel) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addE, edgeLabel);
+        return this.asAdmin().addStep(new AddEdgeStep<>(this.asAdmin(), edgeLabel));
+    }
+
+    /**
+     * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
+     * outgoing vertex of the newly added {@link Edge}.
+     *
+     * @param fromVertex the traversal for selecting the outgoing vertex
+     * @return the traversal with the modified {@link AddEdgeStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
      * @since 3.1.0-incubating
      */
-    public default GraphTraversal<S, E> to(final String toStepLabel) {
+    public default GraphTraversal<S, E> from(final Traversal<?, Vertex> fromVertex) {
         final Step<?,?> prev = this.asAdmin().getEndStep();
         if (!(prev instanceof FromToModulating))
             throw new IllegalArgumentException(String.format(
-                    "The to() step cannot follow %s", prev.getClass().getSimpleName()));
+                    "The from() step cannot follow %s", prev.getClass().getSimpleName()));
 
-        this.asAdmin().getGremlinLang().addStep(Symbols.to, toStepLabel);
-        ((FromToModulating) prev).addTo(toStepLabel);
+        this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
+        ((FromToModulating) prev).addFrom(fromVertex.asAdmin());
         return this;
     }
 
@@ -1753,21 +1491,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
 
     /**
      * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
-     * incoming vertex of the newly added {@link Edge}.
+     * outgoing vertex of the newly added {@link Edge}.
      *
-     * @param toVertex the traversal for selecting the incoming vertex
+     * @param fromVertex the vertex for selecting the outgoing vertex
      * @return the traversal with the modified {@link AddEdgeStep}
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
-     * @since 3.1.0-incubating
+     * @since 4.0.0
      */
-    public default GraphTraversal<S, E> to(final Traversal<?, Vertex> toVertex) {
+    public default GraphTraversal<S, E> from(final GValue<Vertex> fromVertex) {
         final Step<?,?> prev = this.asAdmin().getEndStep();
         if (!(prev instanceof FromToModulating))
             throw new IllegalArgumentException(String.format(
-                    "The to() step cannot follow %s", prev.getClass().getSimpleName()));
+                    "The from() step cannot follow %s", prev.getClass().getSimpleName()));
 
-        this.asAdmin().getGremlinLang().addStep(Symbols.to, toVertex);
-        ((FromToModulating) prev).addTo(toVertex.asAdmin());
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.from, fromVertex);
+        ((FromToModulating) prev).addFrom(__.constant(fromVertex).asAdmin());
         return this;
     }
 
@@ -1775,19 +1513,38 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
      * outgoing vertex of the newly added {@link Edge}.
      *
-     * @param fromVertex the traversal for selecting the outgoing vertex
+     * @param fromVertex the vertex for selecting the outgoing vertex
      * @return the traversal with the modified {@link AddEdgeStep}
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
-     * @since 3.1.0-incubating
+     * @since 3.3.0
      */
-    public default GraphTraversal<S, E> from(final Traversal<?, Vertex> fromVertex) {
+    public default GraphTraversal<S, E> from(final Vertex fromVertex) {
         final Step<?,?> prev = this.asAdmin().getEndStep();
         if (!(prev instanceof FromToModulating))
             throw new IllegalArgumentException(String.format(
                     "The from() step cannot follow %s", prev.getClass().getSimpleName()));
 
         this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
-        ((FromToModulating) prev).addFrom(fromVertex.asAdmin());
+        ((FromToModulating) prev).addFrom(__.constant(fromVertex).asAdmin());
+        return this;
+    }
+
+    /**
+     * Provide {@code to()}-modulation to respective steps.
+     *
+     * @param toStepLabel the step label to modulate to.
+     * @return the traversal with the modified {@link FromToModulating} step.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#to-step" target="_blank">Reference Documentation - To Step</a>
+     * @since 3.1.0-incubating
+     */
+    public default GraphTraversal<S, E> to(final String toStepLabel) {
+        final Step<?,?> prev = this.asAdmin().getEndStep();
+        if (!(prev instanceof FromToModulating))
+            throw new IllegalArgumentException(String.format(
+                    "The to() step cannot follow %s", prev.getClass().getSimpleName()));
+
+        this.asAdmin().getBytecode().addStep(Symbols.to, toStepLabel);
+        ((FromToModulating) prev).addTo(toStepLabel);
         return this;
     }
 
@@ -1798,36 +1555,56 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @param toVertex the vertex for selecting the incoming vertex
      * @return the traversal with the modified {@link AddEdgeStep}
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
-     * @since 3.3.0
+     * @since 4.0.0
      */
-    public default GraphTraversal<S, E> to(final Vertex toVertex) {
+    public default GraphTraversal<S, E> to(final GValue<Vertex> toVertex) {
         final Step<?,?> prev = this.asAdmin().getEndStep();
         if (!(prev instanceof FromToModulating))
             throw new IllegalArgumentException(String.format(
                     "The to() step cannot follow %s", prev.getClass().getSimpleName()));
 
-        this.asAdmin().getGremlinLang().addStep(Symbols.to, toVertex);
+        this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.to, toVertex);
         ((FromToModulating) prev).addTo(__.constant(toVertex).asAdmin());
         return this;
     }
 
     /**
      * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
-     * outgoing vertex of the newly added {@link Edge}.
+     * incoming vertex of the newly added {@link Edge}.
      *
-     * @param fromVertex the vertex for selecting the outgoing vertex
+     * @param toVertex the traversal for selecting the incoming vertex
+     * @return the traversal with the modified {@link AddEdgeStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
+     * @since 3.1.0-incubating
+     */
+    public default GraphTraversal<S, E> to(final Traversal<?, Vertex> toVertex) {
+        final Step<?,?> prev = this.asAdmin().getEndStep();
+        if (!(prev instanceof FromToModulating))
+            throw new IllegalArgumentException(String.format(
+                    "The to() step cannot follow %s", prev.getClass().getSimpleName()));
+
+        this.asAdmin().getGremlinLang().addStep(Symbols.to, toVertex);
+        ((FromToModulating) prev).addTo(toVertex.asAdmin());
+        return this;
+    }
+
+    /**
+     * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
+     * incoming vertex of the newly added {@link Edge}.
+     *
+     * @param toVertex the vertex for selecting the incoming vertex
      * @return the traversal with the modified {@link AddEdgeStep}
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
      * @since 3.3.0
      */
-    public default GraphTraversal<S, E> from(final Vertex fromVertex) {
+    public default GraphTraversal<S, E> to(final Vertex toVertex) {
         final Step<?,?> prev = this.asAdmin().getEndStep();
         if (!(prev instanceof FromToModulating))
             throw new IllegalArgumentException(String.format(
-                    "The from() step cannot follow %s", prev.getClass().getSimpleName()));
+                    "The to() step cannot follow %s", prev.getClass().getSimpleName()));
 
-        this.asAdmin().getGremlinLang().addStep(Symbols.from, fromVertex);
-        ((FromToModulating) prev).addFrom(__.constant(fromVertex).asAdmin());
+        this.asAdmin().getGremlinLang().addStep(Symbols.to, toVertex);
+        ((FromToModulating) prev).addTo(__.constant(toVertex).asAdmin());
         return this;
     }
 
@@ -2778,6 +2555,22 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new TraversalFilterStep(this.asAdmin(), __.values(propertyKey)));
     }
 
+    /**
+     * Filters vertices, edges and vertex properties based on their properties.
+     *
+     * @param label       the label of the {@link Element}
+     * @param propertyKey the key of the property to filter on
+     * @param value       the value to compare the accessor value to for equality
+     * @return the traversal with an appended {@link HasStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final Object value) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value);
+        TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
+        return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, value instanceof P ? (P) value : P.eq(value)));
+    }
+
     /**
      * Filters vertices, edges and vertex properties based on the non-existence of properties.
      *
@@ -2805,11 +2598,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
 
         // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
         // do this but the failure is ugly if not handled.
-        final int otherLabelsLength = null == otherLabels ? 0 : otherLabels.length;
-        final String[] labels = new String[otherLabelsLength + 1];
-        labels[0] = label;
-        if (otherLabelsLength > 0)
-            System.arraycopy(otherLabels, 0, labels, 1, otherLabelsLength);
+        final String[] labels = CollectionUtil.addFirst(otherLabels, label, String.class);
         return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), labels.length == 1 ? P.eq(labels[0]) : P.within(labels)));
     }
 
@@ -2832,6 +2621,24 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         }
     }
 
+    /**
+     * Filters vertices, edges and vertex properties based on their label.
+     *
+     * @param label       the label of the {@link Element}
+     * @param otherLabels additional labels of the {@link Element}
+     * @return the traversal with an appended {@link HasStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, E> hasLabel(final GValue<String> label, final GValue<String>... otherLabels) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
+
+        // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
+        // do this but the failure is ugly if not handled.
+        final Object[] labels = CollectionUtil.addFirst(otherLabels, label, GValue.class);
+        return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), labels.length == 1 ? P.eq(labels[0]) : P.within(labels)));
+    }
+
     /**
      * Filters vertices, edges and vertex properties based on their identifier.
      *
@@ -3049,6 +2856,19 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
     }
 
+    /**
+     * Filter the <code>E</code> object given a biased coin toss. For internal use for  parameterization features.
+     *
+     * @param probability the probability that the object will pass through the filter
+     * @return the traversal with an appended {@link CoinStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#coin-step" target="_blank">Reference Documentation - Coin Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, E> coin(final GValue<Double> probability) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.coin, probability);
+        return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
+    }
+
     /**
      * Filter the objects in the traversal by the number of them to pass through the stream. Those before the value
      * of {@code low} do not pass through and those that exceed the value of {@code high} will end the iteration.
@@ -4444,6 +4264,73 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this;
     }
 
+    /**
+     * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+     * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+     * the documentation of such steps to understand the usage context.
+     *
+     * @param token       the token that would trigger this option which may be a {@link Pick}, {@link Merge},
+     *                    a {@link Traversal}, {@link Predicate}, or object depending on the step being modulated.
+     * @param traversalOption the option as a traversal
+     * @return the traversal with the modulated step
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step" target="_blank">Reference Documentation - Choose Step</a>
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+     * @since 3.0.0-incubating
+     */
+    public default <M, E2> GraphTraversal<S, E> option(final GValue<M> token, final Traversal<?, E2> traversalOption) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, traversalOption);
+
+        // handle null similar to how option() with Map handles it, otherwise we get a NPE if this one gets used
+        final Traversal.Admin<E,E2> t = null == traversalOption ?
+                new ConstantTraversal<>(null) : (Traversal.Admin<E, E2>) traversalOption.asAdmin();
+        ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token.get(), t);
+        return this;
+    }
+
+    /**
+     * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+     * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+     * the documentation of such steps to understand the usage context.
+     *
+     * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
+     * @return the traversal with the modulated step
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+     * @since 3.7.3
+     */
+    public default <M, E2> GraphTraversal<S, E> option(final M token, final GValue<Map<Object, Object>> m) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m);
+        ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
+        return this;
+    }
+
+    /**
+     * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+     * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+     * the documentation of such steps to understand the usage context.
+     *
+     * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
+     * @return the traversal with the modulated step
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+     * @since 3.7.3
+     */
+    public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final GValue<Map<Object, Object>> m, final VertexProperty.Cardinality cardinality) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, merge, m, cardinality);
+
+        final Map<Object, Object> map = m.get();
+
+        // do explicit cardinality for every single pair in the map
+        for (Object k : map.keySet()) {
+            final Object o = map.get(k);
+            if (!(o instanceof CardinalityValueTraversal))
+                map.put(k, new CardinalityValueTraversal(cardinality, o));
+        }
+        ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption((M) merge, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
+        return this;
+    }
+
     ////
 
     ///////////////////// IO STEPS /////////////////////
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 61081d91e5..f6292c47de 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -69,7 +69,6 @@ public class GraphTraversalSource implements TraversalSource {
     protected final Graph graph;
     protected TraversalStrategies strategies;
     protected GremlinLang gremlinLang = new GremlinLang();
-    protected Admin admin;
 
     ////////////////
 
@@ -102,12 +101,6 @@ public class GraphTraversalSource implements TraversalSource {
         this.strategies.addStrategies(new RemoteStrategy(connection));
     }
 
-    public GraphTraversalSource.Admin asAdmin() {
-        if (null == this.admin)
-            this.admin = new Admin();
-        return this.admin;
-    }
-
     @Override
     public Optional<Class<?>> getAnonymousTraversalClass() {
         return Optional.of(__.class);
@@ -414,6 +407,22 @@ public class GraphTraversalSource implements TraversalSource {
         return traversal.addStep(step);
     }
 
+    /**
+     * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Vertex} using a
+     * {@code Map} as an argument. The {@code Map} represents search criteria and will match each of the supplied
+     * key/value pairs where the keys may be {@code String} property values or a value of {@link T}. If a match is not
+     * made it will use that search criteria to create the new {@link Vertex}.
+     *
+     * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
+     * @since 4.0.0
+     */
+    public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
+        final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+        clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
+        final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
+        return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate));
+    }
+
     /**
      * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
      * {@code Map} as an argument.
@@ -446,6 +455,20 @@ public class GraphTraversalSource implements TraversalSource {
         return traversal.addStep(step);
     }
 
+    /**
+     * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
+     * {@code Map} as an argument.
+     *
+     * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
+     * @since 4.0.0
+     */
+    public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, Object>> searchCreate) {
+        final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+        clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
+        final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
+        return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate));
+    }
+
     /**
      * Spawns a {@link GraphTraversal} starting it with arbitrary values.
      */
@@ -626,72 +649,4 @@ public class GraphTraversalSource implements TraversalSource {
         return StringFactory.traversalSourceString(this);
     }
 
-
-    /**
-     * This class masks spawn steps that are more reserved for advanced usage.
-     */
-    public class Admin {
-
-        /**
-         * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
-         * static parameters.
-         *
-         * @param service the name of the service call
-         * @param params static parameter map (no nested traversals)
-         * @since 4.0.0
-         */
-        public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params) {
-            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-            clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
-            final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
-            return traversal.addStep(new CallStep<>(traversal, true, service, params));
-        }
-
-        /**
-         * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
-         * static parameters.
-         *
-         * @param service the name of the service call
-         * @param params static parameter map (no nested traversals)
-         * @since 4.0.0
-         */
-        public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params, final Traversal<S, Map> childTraversal) {
-            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-            clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
-            final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
-            return traversal.addStep(new CallStep<>(traversal, true, service, params, childTraversal.asAdmin()));
-        }
-
-        /**
-         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Vertex} using a
-         * {@code Map} as an argument. The {@code Map} represents search criteria and will match each of the supplied
-         * key/value pairs where the keys may be {@code String} property values or a value of {@link T}. If a match is not
-         * made it will use that search criteria to create the new {@link Vertex}.
-         *
-         * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
-         * @since 4.0.0
-         */
-        public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
-            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-            clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
-            final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
-            return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate));
-        }
-
-        /**
-         * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Edge} using a
-         * {@code Map} as an argument.
-         *
-         * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
-         * @since 4.0.0
-         */
-        public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, Object>> searchCreate) {
-            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
-            clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
-            final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
-            return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate));
-        }
-
-    }
-
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 57776db82e..a72f31289e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -25,6 +25,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FormatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 import org.apache.tinkerpop.gremlin.structure.Column;
@@ -110,6 +112,13 @@ public class __ {
         return __.<A>start().constant(a);
     }
 
+    /**
+     * @see GraphTraversal#constant(GValue)
+     */
+    public static <A> GraphTraversal<A, A> constant(final GValue<A> a) {
+        return __.<A>start().constant(a);
+    }
+
     /**
      * @see GraphTraversal#label()
      */
@@ -145,6 +154,13 @@ public class __ {
         return __.<Vertex>start().to(direction, edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#to(Direction, GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Vertex> to(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().to(direction, edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#out(String...)
      */
@@ -152,6 +168,13 @@ public class __ {
         return __.<Vertex>start().out(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#out(GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Vertex> out(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().out(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#in(String...)
      */
@@ -159,6 +182,13 @@ public class __ {
         return __.<Vertex>start().in(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#in(String...)
+     */
+    public static GraphTraversal<Vertex, Vertex> in(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().in(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#both(String...)
      */
@@ -166,6 +196,13 @@ public class __ {
         return __.<Vertex>start().both(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#both(GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Vertex> both(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().both(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#toE(Direction, String...)
      */
@@ -173,6 +210,13 @@ public class __ {
         return __.<Vertex>start().toE(direction, edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#toE(Direction, GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Edge> toE(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().toE(direction, edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#outE(String...)
      */
@@ -180,6 +224,13 @@ public class __ {
         return __.<Vertex>start().outE(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#outE(GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Edge> outE(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().outE(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#inE(String...)
      */
@@ -187,6 +238,13 @@ public class __ {
         return __.<Vertex>start().inE(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#inE(GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Edge> inE(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().inE(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#bothE(String...)
      */
@@ -194,6 +252,13 @@ public class __ {
         return __.<Vertex>start().bothE(edgeLabels);
     }
 
+    /**
+     * @see GraphTraversal#bothE(GValue, GValue...)
+     */
+    public static GraphTraversal<Vertex, Edge> bothE(final GValue<String> edgeLabel, final GValue<String>... edgeLabels) {
+        return __.<Vertex>start().bothE(edgeLabel, edgeLabels);
+    }
+
     /**
      * @see GraphTraversal#toV(Direction)
      */
@@ -512,6 +577,13 @@ public class __ {
         return __.<A>start().addV(vertexLabel);
     }
 
+    /**
+     * @see GraphTraversal#addV(GValue)
+     */
+    public static <A> GraphTraversal<A, Vertex> addV(final GValue<String> vertexLabel) {
+        return __.<A>start().addV(vertexLabel);
+    }
+
     /**
      * @see GraphTraversal#addV(org.apache.tinkerpop.gremlin.process.traversal.Traversal)
      */
@@ -540,6 +612,13 @@ public class __ {
         return __.<A>start().mergeV(searchCreate);
     }
 
+    /**
+     * @see GraphTraversal#mergeV(GValue)
+     */
+    public static <A> GraphTraversal<A, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
+        return __.<A>start().mergeV(searchCreate);
+    }
+
     /**
      * @see GraphTraversal#mergeV(Traversal)
      */
@@ -554,6 +633,13 @@ public class __ {
         return __.<A>start().addE(edgeLabel);
     }
 
+    /**
+     * @see GraphTraversal#addE(GValue)
+     */
+    public static <A> GraphTraversal<A, Edge> addE(final GValue<String> edgeLabel) {
+        return __.<A>start().addE(edgeLabel);
+    }
+
     /**
      * @see GraphTraversal#addE(Traversal)
      */
@@ -575,6 +661,13 @@ public class __ {
         return __.<A>start().mergeE(searchCreate);
     }
 
+    /**
+     * @see GraphTraversal#mergeE(GValue)
+     */
+    public static <A> GraphTraversal<A, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
+        return __.<A>start().mergeE(searchCreate);
+    }
+
     /**
      * @see GraphTraversal#mergeE(Traversal)
      */
@@ -934,6 +1027,13 @@ public class __ {
         return __.<A>start().has(label, propertyKey, value);
     }
 
+    /**
+     * @see GraphTraversal#has(GValue, String, Object)
+     */
+    public static <A> GraphTraversal<A, A> has(final GValue<String> label, final String propertyKey, final Object value) {
+        return __.<A>start().has(label, propertyKey, value);
+    }
+
     /**
      * @see GraphTraversal#has(String, String, P)
      */
@@ -976,6 +1076,13 @@ public class __ {
         return __.<A>start().hasLabel(label, otherLabels);
     }
 
+    /**
+     * @see GraphTraversal#hasLabel(GValue, GValue...)
+     */
+    public static <A> GraphTraversal<A, A> hasLabel(final GValue<String> label, GValue<String>... otherLabels) {
+        return __.<A>start().hasLabel(label, otherLabels);
+    }
+
     /**
      * @see GraphTraversal#hasLabel(P)
      */
@@ -1074,6 +1181,13 @@ public class __ {
         return __.<A>start().coin(probability);
     }
 
+    /**
+     * @see GraphTraversal#coin(GValue)
+     */
+    public static <A> GraphTraversal<A, A> coin(final GValue<Double> probability) {
+        return __.<A>start().coin(probability);
+    }
+
     /**
      * @see GraphTraversal#range(long, long)
      */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index cb18dec8b9..0b1e88b15c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * A {@code GValue} is a variable or literal value that is used in a {@link Traversal}. It is composed of a key-value
@@ -56,6 +57,47 @@ public class GValue<V> implements Cloneable, Serializable {
         this.value = value;
     }
 
+    /**
+     * The elements in object array argument are examined to see if they are {@link GValue} objects. If they are, they
+     * are preserved as is. If they are not then they are wrapped in a {@link GValue} object.
+     */
+    public static <T> GValue<T>[] convertToGValues(final Object[] args) {
+        return Stream.of(args).map(id -> {
+            if (id instanceof GValue)
+                return (GValue<?>) id;
+            else
+                return of(id);
+        }).toArray(GValue[]::new);
+    }
+
+    /**
+     * Converts {@link GValue} objects arguments to their values to prevent them from leaking to the Graph API.
+     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
+     * objects from leaking to the Graph API.
+     */
+    public static Object[] resolveToValues(final List<GValue<?>> gvalues) {
+        // convert gvalues to array
+        final Object[] newIds = new Object[gvalues.size()];
+        int i = 0;
+        for (final GValue<?> gvalue : gvalues) {
+            newIds[i++] = gvalue.get();
+        }
+        return newIds;
+    }
+
+    /**
+     * Converts {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
+     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
+     * objects from leaking to the Graph API.
+     */
+    public static Object[] resolveToValues(final GValue<?>[] gvalues) {
+        final Object[] newIds = new Object[gvalues.length];
+        for (int i = 0; i < gvalues.length; i++) {
+            newIds[i] = gvalues[i].get();
+        }
+        return newIds;
+    }
+
     /**
      * Determines if the value held by this object was defined as a variable or a literal value. Literal values simply
      * have no name.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index 0a4635240a..f65ecb7e81 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -70,13 +70,13 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.returnClass = returnClass;
 
         // if ids is a single collection like g.V(['a','b','c']), then unroll it into an array of ids
-        this.ids = convertToGValues(tryUnrollSingleCollectionArgument(ids));
+        this.ids = GValue.convertToGValues(tryUnrollSingleCollectionArgument(ids));
 
         this.isStart = isStart;
 
         this.iteratorSupplier = () -> (Iterator<E>) (Vertex.class.isAssignableFrom(this.returnClass) ?
-                this.getTraversal().getGraph().get().vertices(resolveToValues(this.ids)) :
-                this.getTraversal().getGraph().get().edges(resolveToValues(this.ids)));
+                this.getTraversal().getGraph().get().vertices(GValue.resolveToValues(this.ids)) :
+                this.getTraversal().getGraph().get().edges(GValue.resolveToValues(this.ids)));
     }
 
     /**
@@ -155,7 +155,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
      */
     public Object[] getIdsAsValues() {
         if (legacyLogicForPassingNoIds) return null;
-        return resolveToValues(this.ids);
+        return GValue.resolveToValues(this.ids);
     }
 
     public void addIds(final Object... newIds) {
@@ -169,7 +169,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.legacyLogicForPassingNoIds = newIds.length == 1 && ((newIds[0] instanceof List && ((List) newIds[0]).isEmpty()) ||
                 (newIds[0] instanceof GValue && ((GValue) newIds[0]).getType().isCollection() && ((List) ((GValue) newIds[0]).get()).isEmpty()));
 
-        final GValue[] gvalues = convertToGValues(tryUnrollSingleCollectionArgument(newIds));
+        final GValue[] gvalues = GValue.convertToGValues(tryUnrollSingleCollectionArgument(newIds));
         this.ids = ArrayUtils.addAll(this.ids, gvalues);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
index e27fbb3802..896934668d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
@@ -54,24 +54,14 @@ public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implem
     private final Class<E> returnClass;
 
     public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final String... edgeLabels) {
-        this(traversal, returnClass, direction, (Object[]) edgeLabels);
+        this(traversal, returnClass, direction, GValue.convertToGValues(edgeLabels));
     }
 
-    public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final Object... edgeLabels) {
+    public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final GValue<String>... edgeLabels) {
         super(traversal);
         this.direction = direction;
         this.returnClass = returnClass;
-
-        // check each edgeLabel to ensure it is a string or a GValue with a GType.STRING in it. if it is just a string
-        // then convert edgeLabels to a GValue<String> or otherwise throw an exception
-        this.edgeLabelsGValue = Arrays.stream(edgeLabels).map(edgeLabel -> {
-            if (edgeLabel instanceof String)
-                return GValue.ofString((String) edgeLabel);
-            else if (edgeLabel instanceof GValue && ((GValue<String>) edgeLabel).get().getClass().equals(String.class))
-                return (GValue<String>) edgeLabel;
-            else
-                throw new IllegalArgumentException("All edge labels must be strings");
-        }).toArray(GValue[]::new);
+        this.edgeLabelsGValue = edgeLabels;
 
         // convert the GValue<String> to a String[] for the edgeLabels field to cache the values
         this.edgeLabels = Arrays.stream(this.edgeLabelsGValue).map(GValue::get).toArray(String[]::new);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 0dae0ed01d..59e3909b62 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -32,21 +32,21 @@ public final class InjectStep<S> extends StartStep<S> {
     @SafeVarargs
     public InjectStep(final Traversal.Admin traversal, final S... injections) {
         super(traversal);
-        this.injections = convertToGValues(injections);
-        this.start = new ArrayIterator<>(resolveToValues(this.injections));
+        this.injections = GValue.convertToGValues(injections);
+        this.start = new ArrayIterator<>(GValue.resolveToValues(this.injections));
     }
 
     @Override
     public InjectStep<S> clone() {
         final InjectStep<S> clone = (InjectStep<S>) super.clone();
-        clone.start = new ArrayIterator<>(resolveToValues(clone.injections));
+        clone.start = new ArrayIterator<>(GValue.resolveToValues(clone.injections));
         return clone;
     }
 
     @Override
     public void reset() {
         super.reset();
-        this.start = new ArrayIterator<>(resolveToValues(this.injections));
+        this.start = new ArrayIterator<>(GValue.resolveToValues(this.injections));
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
index dd6f5fb849..f0af790c73 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
@@ -32,11 +31,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Stream;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -232,45 +229,4 @@ public abstract class AbstractStep<S, E> implements Step<S, E> {
         }
         return traverser;
     }
-
-    /**
-     * The elements in object array argument are examined to see if they are {@link GValue} objects. If they are, they
-     * are preserved as is. If they are not then they are wrapped in a {@link GValue} object.
-     */
-    protected static <T> GValue<T>[] convertToGValues(final Object[] args) {
-        return Stream.of(args).map(id -> {
-            if (id instanceof GValue)
-                return (GValue<?>) id;
-            else
-                return GValue.of(id);
-        }).toArray(GValue[]::new);
-    }
-
-    /**
-     * Converts {@link GValue} objects arguments to their values to prevent them from leaking to the Graph API.
-     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
-     * objects from leaking to the Graph API.
-     */
-    protected Object[] resolveToValues(final List<GValue<?>> gvalues) {
-        // convert gvalues to array
-        final Object[] newIds = new Object[gvalues.size()];
-        int i = 0;
-        for (final GValue<?> gvalue : gvalues) {
-            newIds[i++] = gvalue.get();
-        }
-        return newIds;
-    }
-
-    /**
-     * Converts {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
-     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
-     * objects from leaking to the Graph API.
-     */
-    protected Object[] resolveToValues(final GValue<?>[] gvalues) {
-        final Object[] newIds = new Object[gvalues.length];
-        for (int i = 0; i < gvalues.length; i++) {
-            newIds[i] = gvalues[i].get();
-        }
-        return newIds;
-    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index f7ff96009d..ad0ccf395f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -158,7 +158,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
                 }
             }
             if (!edgeLabels.isEmpty()) {
-                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), edgeLabels.toArray(new Object[edgeLabels.size()]));
+                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), GValue.convertToGValues(edgeLabels.toArray()));
                 TraversalHelper.replaceStep(previousStep, newVertexStep, traversal);
                 TraversalHelper.copyLabels(previousStep, newVertexStep, false);
                 if (step.getHasContainers().isEmpty()) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
index 1242d16af7..61d9d7573d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
@@ -19,6 +19,9 @@
 
 package org.apache.tinkerpop.gremlin.util;
 
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -74,4 +77,22 @@ public final class CollectionUtil {
 
         return result;
     }
+
+    /**
+     * Adds the element argument to the start of the supplied array argument, but if the array is null then return the
+     * element as a new array with just that item in it.
+     */
+    public static <T> T[] addFirst(final T[] array, final T element, final Class<T> clazz) {
+        if (null == array && null == element) {
+            final T[] singleElementArray = (T[]) Array.newInstance(clazz, 1);
+            singleElementArray[0] = null;
+            return singleElementArray;
+        } else if (null == array) {
+            final T[] singleElementArray = (T[]) Array.newInstance(clazz, 1);
+            singleElementArray[0] = element;
+            return singleElementArray;
+        } else {
+            return ArrayUtils.addFirst(array, element);
+        }
+    }
 }


(tinkerpop) 14/20: wip - added param to has(string, string, object)

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit db7865ae8ff1cacb1b73752f4526ee2d9f03dd30
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Aug 26 18:02:11 2024 -0400

    wip - added param to has(string, string, object)
---
 .../language/grammar/TraversalMethodVisitor.java   | 13 +++++++++---
 .../traversal/dsl/graph/GraphTraversal.java        | 16 +++++++++++++++
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  2 ++
 gremlin-go/driver/cucumber/gremlin.go              |  2 ++
 .../gremlin-javascript/test/cucumber/gremlin.js    |  2 ++
 gremlin-python/src/main/python/radish/gremlin.py   |  2 ++
 .../gremlin/test/features/filter/Has.feature       | 24 ++++++++++++++++++++++
 7 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index 38aa65f6b2..ce010e326e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -836,9 +836,16 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_String_Object(final GremlinParser.TraversalMethod_has_String_String_ObjectContext ctx) {
-        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument(0)),
-                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)),
-                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitStringNullableArgument(ctx.stringNullableArgument(0));
+        if (GValue.valueInstanceOf(literalOrVar, GType.STRING)) {
+            return graphTraversal.has((GValue) literalOrVar,
+                    antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)),
+                    antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        } else {
+            return graphTraversal.has((String) literalOrVar,
+                    antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)),
+                    antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        }
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6342c981c6..5cf66f4d6c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -684,6 +684,22 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
             return this.asAdmin().addStep(step);
         }
 
+        /**
+         * Filters vertices, edges and vertex properties based on their properties.
+         *
+         * @param label       the label of the {@link Element}
+         * @param propertyKey the key of the property to filter on
+         * @param value       the value to compare the accessor value to for equality
+         * @return the traversal with an appended {@link HasStep}
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
+         * @since 4.0.0
+         */
+        public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final Object value) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value);
+            TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label)));
+            return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, value instanceof P ? (P) value : P.eq(value)));
+        }
+
         @Override
         public default <E2> GraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
             return (GraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index 49eb11fe5d..b324e8be68 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -234,6 +234,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_VX1X_out_hasXid_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V((Vertex) p["v2"]).Has("age", P.Gt(30))}}, 
                {"g_V_hasXblahX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("blah")}}, 
                {"g_V_hasXperson_name_markoX_age", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("person", "name", "marko").Values<object>("age")}}, 
+               {"g_V_hasXperson_name_markovarX_age", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("person", "name", (object) p["xx1"]).Values<object>("age")}}, 
+               {"g_V_hasXpersonvar_name_markoX_age", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has((string) p["xx1"], "name", "marko").Values<object>("age")}}, 
                {"g_VX1X_outE_hasXweight_inside_0_06X_inV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().Has("weight", P.Inside(0.0, 0.6)).InV()}}, 
                {"g_EX11X_outV_outE_hasXid_10X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E(p["eid11"]).OutV().OutE().Has(T.Id, (object) p["eid10"])}}, 
                {"g_EX11X_outV_outE_hasXid_10AsStringX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E(p["eid11"]).OutV().OutE().Has(T.Id, (object) p["eid10"])}}, 
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index 449783b0f4..667ae6d1f3 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -204,6 +204,8 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_VX1X_out_hasXid_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["v2"]).Has("age", gremlingo.P.Gt(30))}}, 
     "g_V_hasXblahX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("blah")}}, 
     "g_V_hasXperson_name_markoX_age": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Values("age")}}, 
+    "g_V_hasXperson_name_markovarX_age": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", p["xx1"]).Values("age")}}, 
+    "g_V_hasXpersonvar_name_markoX_age": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has(p["xx1"], "name", "marko").Values("age")}}, 
     "g_VX1X_outE_hasXweight_inside_0_06X_inV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE().Has("weight", gremlingo.P.Inside(0.0, 0.6)).InV()}}, 
     "g_EX11X_outV_outE_hasXid_10X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"]).OutV().OutE().Has(gremlingo.T.Id, p["eid10"])}}, 
     "g_EX11X_outV_outE_hasXid_10AsStringX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"]).OutV().OutE().Has(gremlingo.T.Id, p["eid10"])}}, 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index 273d2b6da8..d381f1a8da 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -225,6 +225,8 @@ const gremlins = {
     g_VX1X_out_hasXid_2X: [function({g, v2}) { return g.V(v2).has("age", P.gt(30)) }], 
     g_V_hasXblahX: [function({g}) { return g.V().has("blah") }], 
     g_V_hasXperson_name_markoX_age: [function({g}) { return g.V().has("person", "name", "marko").values("age") }], 
+    g_V_hasXperson_name_markovarX_age: [function({g, xx1}) { return g.V().has("person", "name", xx1).values("age") }], 
+    g_V_hasXpersonvar_name_markoX_age: [function({g, xx1}) { return g.V().has(xx1, "name", "marko").values("age") }], 
     g_VX1X_outE_hasXweight_inside_0_06X_inV: [function({g, vid1}) { return g.V(vid1).outE().has("weight", P.inside(0.0, 0.6)).inV() }], 
     g_EX11X_outV_outE_hasXid_10X: [function({g, eid11, eid10}) { return g.E(eid11).outV().outE().has(T.id, eid10) }], 
     g_EX11X_outV_outE_hasXid_10AsStringX: [function({g, eid11, eid10}) { return g.E(eid11).outV().outE().has(T.id, eid10) }], 
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 044b366215..f5e906f5d1 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -207,6 +207,8 @@ world.gremlins = {
     'g_VX1X_out_hasXid_2X': [(lambda g, v2=None:g.V(v2).has('age', P.gt(30)))], 
     'g_V_hasXblahX': [(lambda g:g.V().has('blah'))], 
     'g_V_hasXperson_name_markoX_age': [(lambda g:g.V().has('person', 'name', 'marko').values('age'))], 
+    'g_V_hasXperson_name_markovarX_age': [(lambda g, xx1=None:g.V().has('person', 'name', xx1).values('age'))], 
+    'g_V_hasXpersonvar_name_markoX_age': [(lambda g, xx1=None:g.V().has(xx1, 'name', 'marko').values('age'))], 
     'g_VX1X_outE_hasXweight_inside_0_06X_inV': [(lambda g, vid1=None:g.V(vid1).out_e().has('weight', P.inside(0.0, 0.6)).in_v())], 
     'g_EX11X_outV_outE_hasXid_10X': [(lambda g, eid11=None,eid10=None:g.E(eid11).out_v().out_e().has(T.id_, eid10))], 
     'g_EX11X_outV_outE_hasXid_10AsStringX': [(lambda g, eid11=None,eid10=None:g.E(eid11).out_v().out_e().has(T.id_, eid10))], 
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
index c10757748d..8a1db09a05 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
@@ -206,6 +206,30 @@ Feature: Step - has()
       | result |
       | d[29].i |
 
+  Scenario: g_V_hasXperson_name_markovarX_age
+    Given the modern graph
+    And using the parameter xx1 defined as "marko"
+    And the traversal of
+    """
+    g.V().has("person", "name", xx1).values("age")
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[29].i |
+
+  Scenario: g_V_hasXpersonvar_name_markoX_age
+    Given the modern graph
+    And using the parameter xx1 defined as "person"
+    And the traversal of
+    """
+    g.V().has(xx1, "name", "marko").values("age")
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[29].i |
+
   Scenario: g_VX1X_outE_hasXweight_inside_0_06X_inV
     Given the modern graph
     And using the parameter vid1 defined as "v[marko].id"


(tinkerpop) 17/20: wip - moved all the params out of admin interfaces - not working

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 93be41da5c7605d2aba493755dcd8ad52d1e43b5
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Aug 27 16:06:14 2024 -0400

    wip - moved all the params out of admin interfaces - not working
---
 .../grammar/TraversalSourceSpawnMethodVisitor.java |   8 +-
 .../traversal/dsl/graph/GraphTraversal.java        | 118 +++++++++++++++++++++
 .../traversal/dsl/graph/GraphTraversalSource.java  |  30 ++++++
 .../gremlin/process/traversal/dsl/graph/__.java    |  63 +++++++++++
 .../traversal/step/sideEffect/InjectStep.java      |   2 +-
 .../traversal/step/map/ConjoinStepTest.java        |   2 +-
 6 files changed, 217 insertions(+), 6 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
index 2758ea429c..02fb654451 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
@@ -123,7 +123,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
         if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
-            return this.traversalSource.asAdmin().mergeV((GValue) literalOrVar);
+            return this.traversalSource.mergeV((GValue) literalOrVar);
         else
             return this.traversalSource.mergeV((Map) literalOrVar);
     }
@@ -151,7 +151,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
         if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
-            return this.traversalSource.asAdmin().mergeE((GValue) literalOrVar);
+            return this.traversalSource.mergeE((GValue) literalOrVar);
         else
             return this.traversalSource.mergeE((Map) literalOrVar);
     }
@@ -179,7 +179,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map(final GremlinParser.TraversalSourceSpawnMethod_call_string_mapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
         if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
-            return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
+            return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
         else
             return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar);
     }
@@ -200,7 +200,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map_traversal(final GremlinParser.TraversalSourceSpawnMethod_call_string_map_traversalContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
         if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
-            return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
+            return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
         else
             return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 5f6825acdc..572c46f52b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1661,6 +1661,21 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(call);
     }
 
+    /**
+     * Perform the specified service call with the specified static parameters.
+     *
+     * @param service the name of the service call
+     * @param params static parameter map (no nested traversals)
+     * @return the traversal with an appended {@link CallStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
+     * @since 4.0.0
+     */
+    default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params);
+        final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params);
+        return this.asAdmin().addStep(call);
+    }
+
     /**
      * Perform the specified service call with dynamic parameters produced by the specified child traversal.
      *
@@ -1696,6 +1711,25 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(step);
     }
 
+    /**
+     * Perform the specified service call with both static and dynamic parameters produced by the specified child
+     * traversal. These parameters will be merged at execution time per the provider implementation. Reference
+     * implementation merges dynamic into static (dynamic will overwrite static).
+     *
+     * @param service the name of the service call
+     * @param params static parameter map (no nested traversals)
+     * @param childTraversal a traversal that will produce a Map of parameters for the service call when invoked.
+     * @return the traversal with an appended {@link CallStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
+     * @since 4.0.0
+     */
+    default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
+        final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service, params) :
+                new CallStep(this.asAdmin(), false, service, params, childTraversal.asAdmin());
+        return this.asAdmin().addStep(step);
+    }
+
     /**
      * Concatenate values of an arbitrary number of string traversals to the incoming traverser.
      *
@@ -2145,6 +2179,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Calculates the difference between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link DifferenceStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#difference-step" target="_blank">Reference Documentation - Difference Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values);
+        return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
+    }
+
     /**
      * Calculates the disjunction between the list traverser and list argument.
      *
@@ -2157,6 +2203,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Calculates the disjunction between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link DisjunctStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#disjunct-step" target="_blank">Reference Documentation - Disjunct Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values);
+        return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
+    }
+
     /**
      * Calculates the intersection between the list traverser and list argument.
      *
@@ -2169,6 +2227,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Calculates the intersection between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link IntersectStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#intersect-step" target="_blank">Reference Documentation - Intersect Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values);
+        return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
+    }
+
     /**
      * Joins together the elements of the incoming list traverser together with the provided delimiter.
      *
@@ -2181,6 +2251,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
     }
 
+    /**
+     * Joins together the elements of the incoming list traverser together with the provided delimiter.
+     *
+     * @return the traversal with an appended {@link ConjoinStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#conjoin-step" target="_blank">Reference Documentation - Conjoin Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, String> conjoin(final GValue<String> delimiter) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.conjoin, delimiter);
+        return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
+    }
+
     /**
      * Merges the list traverser and list argument. Also known as union.
      *
@@ -2193,6 +2275,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Merges the list traverser and list argument. Also known as union.
+     *
+     * @return the traversal with an appended {@link MergeStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
+     * @since 4.0.0
+     */
+    public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
+        return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
+    }
+
     /**
      * Combines the list traverser and list argument. Also known as concatenation or append.
      *
@@ -2205,6 +2299,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Combines the list traverser and list argument. Also known as concatenation or append.
+     *
+     * @return the traversal with an appended {@link CombineStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#combine-step" target="_blank">Reference Documentation - Combine Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, List<?>> combine(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.combine, values);
+        return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
+    }
+
     /**
      * Calculates the cartesian product between the list traverser and list argument.
      *
@@ -2217,6 +2323,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
     }
 
+    /**
+     * Calculates the cartesian product between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link ProductStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#product-step" target="_blank">Reference Documentation - Product Step</a>
+     * @since 4.0.0
+     */
+    public default GraphTraversal<S, List<List<?>>> product(final GValue<Object> values) {
+        this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.product, values);
+        return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
+    }
+
     ///////////////////// FILTER STEPS /////////////////////
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index f6292c47de..467d9d7eb4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -588,6 +588,36 @@ public class GraphTraversalSource implements TraversalSource {
         return traversal.addStep(step);
     }
 
+    /**
+     * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
+     * static parameters.
+     *
+     * @param service the name of the service call
+     * @param params static parameter map (no nested traversals)
+     * @since 4.0.0
+     */
+    public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params) {
+        final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+        clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+        final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
+        return traversal.addStep(new CallStep<>(traversal, true, service, params));
+    }
+
+    /**
+     * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
+     * static parameters.
+     *
+     * @param service the name of the service call
+     * @param params static parameter map (no nested traversals)
+     * @since 4.0.0
+     */
+    public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params, final Traversal<S, Map> childTraversal) {
+        final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+        clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+        final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
+        return traversal.addStep(new CallStep<>(traversal, true, service, params, childTraversal.asAdmin()));
+    }
+
     /**
      * Merges the results of an arbitrary number of traversals.
      *
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index a72f31289e..59fdf5f605 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -899,6 +899,13 @@ public class __ {
         return __.<A>start().difference(values);
     }
 
+    /**
+     * @see GraphTraversal#difference(GValue)
+     */
+    public static <A> GraphTraversal<A, Set<?>> difference(final GValue<Object> values) {
+        return __.<A>start().difference(values);
+    }
+
     /**
      * @see GraphTraversal#disjunct(Object)
      */
@@ -906,6 +913,13 @@ public class __ {
         return __.<A>start().disjunct(values);
     }
 
+    /**
+     * @see GraphTraversal#disjunct(GValue)
+     */
+    public static <A> GraphTraversal<A, Set<?>> disjunct(final GValue<Object> values) {
+        return __.<A>start().disjunct(values);
+    }
+
     /**
      * @see GraphTraversal#intersect(Object)
      */
@@ -913,6 +927,13 @@ public class __ {
         return __.<A>start().intersect(values);
     }
 
+    /**
+     * @see GraphTraversal#intersect(GValue)
+     */
+    public static <A> GraphTraversal<A, Set<?>> intersect(final GValue<Object> values) {
+        return __.<A>start().intersect(values);
+    }
+
     /**
      * @see GraphTraversal#conjoin(String)
      */
@@ -920,6 +941,13 @@ public class __ {
         return __.<A>start().conjoin(values);
     }
 
+    /**
+     * @see GraphTraversal#conjoin(GValue)
+     */
+    public static <A> GraphTraversal<A, String> conjoin(final GValue<String> values) {
+        return __.<A>start().conjoin(values);
+    }
+
     /**
      * @see GraphTraversal#merge(Object)
      */
@@ -927,6 +955,13 @@ public class __ {
         return __.<A>start().merge(values);
     }
 
+    /**
+     * @see GraphTraversal#merge(GValue)
+     */
+    public static <A, B> GraphTraversal<A, B> merge(final GValue<Object> values) {
+        return __.<A>start().merge(values);
+    }
+
     /**
      * @see GraphTraversal#combine(Object)
      */
@@ -934,6 +969,13 @@ public class __ {
         return __.<A>start().combine(values);
     }
 
+    /**
+     * @see GraphTraversal#combine(GValue)
+     */
+    public static <A> GraphTraversal<A, List<?>> combine(final GValue<Object> values) {
+        return __.<A>start().combine(values);
+    }
+
     /**
      * @see GraphTraversal#product(Object)
      */
@@ -941,6 +983,13 @@ public class __ {
         return __.<A>start().product(values);
     }
 
+    /**
+     * @see GraphTraversal#product(GValue)
+     */
+    public static <A> GraphTraversal<A, List<List<?>>> product(final GValue<Object> values) {
+        return __.<A>start().product(values);
+    }
+
     ///////////////////// FILTER STEPS /////////////////////
 
     /**
@@ -1631,6 +1680,13 @@ public class __ {
         return __.<A>start().call(service, params);
     }
 
+    /**
+     * @see GraphTraversal#call(String, GValue)
+     */
+    public static <A, B> GraphTraversal<A, B> call(final String service, final GValue<Map> params) {
+        return __.<A>start().call(service, params);
+    }
+
     /**
      * @see GraphTraversal#call(String, Traversal)
      */
@@ -1644,4 +1700,11 @@ public class __ {
     public static <A, B> GraphTraversal<A, B> call(final String service, final Map params, final Traversal<?, Map<?,?>> childTraversal) {
         return __.<A>start().call(service, params, childTraversal);
     }
+
+    /**
+     * @see GraphTraversal#call(String, GValue, Traversal)
+     */
+    public static <A, B> GraphTraversal<A, B> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) {
+        return __.<A>start().call(service, params, childTraversal);
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 59e3909b62..73bf40b199 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -60,6 +60,6 @@ public final class InjectStep<S> extends StartStep<S> {
      * Gets the injections of the step but unwraps the {@link GValue}.
      */
     public S[] getInjections() {
-        return (S[]) resolveToValues(this.injections);
+        return (S[]) GValue.resolveToValues(this.injections);
     }
 }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java
index a84c691182..35d9fe29f9 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java
@@ -41,7 +41,7 @@ public class ConjoinStepTest extends StepTest {
     @Test
     public void testReturnTypes() {
         try {
-            __.__(Collections.emptyList()).conjoin(null).next();
+            __.__(Collections.emptyList()).conjoin((String) null).next();
             fail();
         } catch (Exception e) {
             assertTrue(e.getMessage().contains("Input delimiter to conjoin step can't be null"));


(tinkerpop) 09/20: wip - fixed .NET translator for conjoin

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e3a2663a971d744d1c3b959dfaff9881e372d3a1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Sun Aug 25 09:51:42 2024 -0400

    wip - fixed .NET translator for conjoin
---
 .../translator/DotNetTranslateVisitor.java         | 10 +++++++++
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 24 +++++++++++-----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
index 7ab9819c2c..1dbef2042b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
@@ -935,6 +935,16 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
         }
     }
 
+    @Override
+    public Void visitTraversalMethod_conjoin_String(final GremlinParser.TraversalMethod_conjoin_StringContext ctx) {
+        final String step = ctx.getChild(0).getText();
+        sb.append(convertToPascalCase(step));
+        sb.append("((string) ");
+        visit(ctx.stringArgument());
+        sb.append(")");
+        return null;
+    }
+
     @Override
     public Void visitTraversalMethod_propertyMap(final GremlinParser.TraversalMethod_propertyMapContext ctx) {
         return handleGenerics(ctx);
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index f9388d42a0..6264b23da7 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -703,18 +703,18 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values<object>("name").Concat(__.Select<object>("a").Label()).Concat(__.Select<object>("a").InV().Values<object>("name"))}}, 
                {"g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values<object>("name").Concat(__.Select<object>("a").Label(), __.Select<object>("a").InV().Values<object>("name"))}}, 
                {"g_addVXconstantXprefix_X_concatXVX1X_labelX_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple [...]
-               {"g_injectXnullX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Conjoin("1")}}, 
-               {"g_V_valuesXnameX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Conjoin("1")}}, 
-               {"g_V_valuesXnonexistantX_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Conjoin(";")}}, 
-               {"g_V_valuesXnameX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().Conjoin("_")}}, 
-               {"g_V_valuesXageX_order_fold_conjoinXsemicolonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(";")}}, 
-               {"g_V_valuesXageX_order_fold_conjoinXslashX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(p["xx1"])}}, 
-               {"g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Conjoin("MARKO")}}, 
-               {"g_injectXmarkoX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin("-")}}, 
-               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("location").Select<object>(Column.Values).Unfold<object>().Order(Scope.Local).Conjoin("1")}}, 
-               {"g_V_out_out_path_byXnameX_conjoinXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Conjoin("")}}, 
-               {"g_injectXa_null_bX_conjoinXxyzX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin("xyz")}}, 
-               {"g_injectX3_threeX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin(";")}}, 
+               {"g_injectXnullX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Conjoin((string) "1")}}, 
+               {"g_V_valuesXnameX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Conjoin((string) "1")}}, 
+               {"g_V_valuesXnonexistantX_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Conjoin((string) ";")}}, 
+               {"g_V_valuesXnameX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().Conjoin((string) "_")}}, 
+               {"g_V_valuesXageX_order_fold_conjoinXsemicolonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin((string) ";")}}, 
+               {"g_V_valuesXageX_order_fold_conjoinXslashX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin((string) p["xx1"])}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Conjoin((string) "MARKO")}}, 
+               {"g_injectXmarkoX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin((string) "-")}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("location").Select<object>(Column.Values).Unfold<object>().Order(Scope.Local).Conjoin((string) "1")}}, 
+               {"g_V_out_out_path_byXnameX_conjoinXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Conjoin((string) "")}}, 
+               {"g_injectXa_null_bX_conjoinXxyzX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin((string) "xyz")}}, 
+               {"g_injectX3_threeX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin((string) ";")}}, 
                {"g_V_connectedComponent_hasXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
                {"g_V_dedup_connectedComponent_hasXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Dedup().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
                {"g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").ConnectedComponent().Project<object>("name", "component").By("name").By("gremlin.connectedComponentVertexProgram.component")}}, 


(tinkerpop) 11/20: wip - translator fix for .NET

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a97b66edc234883a6326861bb5f21ff4db34b0b9
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Aug 26 08:22:01 2024 -0400

    wip - translator fix for .NET
---
 .../translator/DotNetTranslateVisitor.java         | 37 ++++++++++++++++++++--
 .../language/translator/GremlinTranslatorTest.java | 20 +++++++++++-
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 20 ++++++------
 .../gremlin-javascript/test/cucumber/gremlin.js    |  2 ++
 gremlin-python/src/main/python/radish/gremlin.py   |  2 ++
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
index 1dbef2042b..1a881e429c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
@@ -746,10 +746,36 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
             sb.append(")");
             return null;
         } else {
-            return super.visitTraversalMethod_hasLabel_String_String(ctx);
+            final String step = ctx.getChild(0).getText();
+            sb.append(convertToPascalCase(step));
+            sb.append("(");
+            tryAppendCastToString(ctx.stringNullableArgument());
+            visit(ctx.stringNullableArgument());
+
+            // more arguments to come
+            if (!ctx.stringLiteralVarargs().isEmpty())  sb.append(", ");
+            visit(ctx.stringLiteralVarargs());
+
+            sb.append(")");
+            return null;
         }
     }
 
+    @Override
+    public Void visitStringLiteralVarargs(final GremlinParser.StringLiteralVarargsContext ctx) {
+        for (int ix = 0; ix < ctx.getChildCount(); ix++) {
+            final ParseTree pt = ctx.getChild(ix);
+            if (pt instanceof GremlinParser.StringNullableArgumentContext) {
+                GremlinParser.StringNullableArgumentContext sna = (GremlinParser.StringNullableArgumentContext) pt;
+                tryAppendCastToString(sna);
+                visit(sna);
+            } else {
+                visit(pt);
+            }
+        };
+        return null;
+    }
+
     @Override
     public Void visitTraversalMethod_index(final GremlinParser.TraversalMethod_indexContext ctx) {
         return handleGenerics(ctx);
@@ -939,7 +965,8 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
     public Void visitTraversalMethod_conjoin_String(final GremlinParser.TraversalMethod_conjoin_StringContext ctx) {
         final String step = ctx.getChild(0).getText();
         sb.append(convertToPascalCase(step));
-        sb.append("((string) ");
+        sb.append("(");
+        tryAppendCastToString(ctx.stringArgument());
         visit(ctx.stringArgument());
         sb.append(")");
         return null;
@@ -1160,6 +1187,12 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
         }
     }
 
+    private void tryAppendCastToString(final GremlinParser.StringArgumentContext ctx) {
+        if (ctx.variable() != null || ctx.stringLiteral() != null) {
+            sb.append("(string) ");
+        }
+    }
+
     private void tryAppendCastToString(final GremlinParser.StringNullableArgumentContext ctx) {
         if (ctx.variable() != null || ctx.stringNullableLiteral().NullLiteral() != null) {
             sb.append("(string) ");
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
index 7c920f2613..919eecb664 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
@@ -724,7 +724,7 @@ public class GremlinTranslatorTest {
                     {"g.V().hasLabel(null, 'software', 'class')",
                             null,
                             "g.V().hasLabel(string0, string1, string2)",
-                            "g.V().HasLabel(null, \"software\", \"class\")",
+                            "g.V().HasLabel((string) null, \"software\", \"class\")",
                             "g.V().HasLabel(nil, \"software\", \"class\")",
                             "g.V().hasLabel(null, 'software', 'class')",
                             "g.V().hasLabel(null, \"software\", \"class\")",
@@ -1045,6 +1045,24 @@ public class GremlinTranslatorTest {
                             null,
                             null,
                             null},
+                    {"g.V().hasLabel(x, y)",
+                            null,
+                            null,
+                            "g.V().HasLabel((string) x, (string) y)",
+                            "g.V().HasLabel(x, y)",
+                            null,
+                            null,
+                            null,
+                            "g.V().has_label(x, y)"},
+                    {"g.V().conjoin(x)",
+                            null,
+                            null,
+                            "g.V().Conjoin((string) x)",
+                            "g.V().Conjoin(x)",
+                            null,
+                            null,
+                            null,
+                            null},
                     {"g.mergeV([name:\"alice\", T.label:\"person\"]).option(Merge.onCreate, [age:Cardinality.single(81)])",
                             null,
                             "g.mergeV(map0).option(Merge.onCreate, map1)",
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index 6264b23da7..49eb11fe5d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -292,21 +292,23 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_bothE_properties_dedup_hasKeyXweightX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().BothE().Properties<object>().Dedup().HasKey("weight").Value<object>()}}, 
                {"g_V_bothE_properties_dedup_hasKeyXweightX_hasValueXltX0d3XX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().BothE().Properties<object>().Dedup().HasKey("weight").HasValue(P.Lt(0.3)).Value<object>(), (g,p) =>g.V().BothE().Properties<object>().Dedup().HasKey("weight").HasValue(P.Lt(0.3)).Value<object>()}}, 
                {"g_V_properties_hasKeyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().HasKey((string) null)}}, 
-               {"g_V_properties_hasKeyXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().HasKey(null, null)}}, 
+               {"g_V_properties_hasKeyXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().HasKey(null, (string) null)}}, 
                {"g_V_properties_hasKeyXnull_ageX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().HasKey(null, "age").Value<object>()}}, 
                {"g_E_properties_hasKeyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Properties<object>().HasKey((string) null)}}, 
-               {"g_E_properties_hasKeyXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Properties<object>().HasKey(null, null)}}, 
+               {"g_E_properties_hasKeyXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Properties<object>().HasKey(null, (string) null)}}, 
                {"g_E_properties_hasKeyXnull_weightX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Properties<object>().HasKey(null, "weight").Value<object>()}}, 
                {"g_EX7X_hasLabelXknowsX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E(p["eid7"]).HasLabel("knows")}}, 
                {"g_E_hasLabelXknowsX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().HasLabel("knows")}}, 
                {"g_E_hasLabelXuses_traversesX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().HasLabel("uses", "traverses")}}, 
                {"g_V_hasLabelXperson_software_blahX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person", "software", "blah")}}, 
                {"g_V_hasLabelXpersonX_hasLabelXsoftwareX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").HasLabel("software")}}, 
+               {"g_V_hasLabelXpersonvarX_hasLabelXsoftwareX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel((string) p["xx1"]).HasLabel("software")}}, 
+               {"g_V_hasLabelXpersonvar_softwarevarX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel((string) p["xx1"], (string) p["xx2"])}}, 
                {"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Has("age", P.Not(P.Lte(10).And(P.Not(P.Between(11, 20)))).And(P.Lt(29).Or(P.Eq(35)))).Values<object>("name")}}, 
                {"g_V_hasLabelXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel((string) null)}}, 
                {"g_V_hasXlabel_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has(T.Label, (object) null)}}, 
-               {"g_V_hasLabelXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel(null, null)}}, 
-               {"g_V_hasLabelXnull_personX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel(null, "person")}}, 
+               {"g_V_hasLabelXnull_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel((string) null, (string) null)}}, 
+               {"g_V_hasLabelXnull_personX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel((string) null, "person")}}, 
                {"g_E_hasLabelXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().HasLabel((string) null)}}, 
                {"g_E_hasXlabel_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Has(T.Label, (object) null)}}, 
                {"g_V_properties_hasLabelXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().HasLabel((string) null)}}, 
@@ -695,7 +697,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_injectXaX_concat_Xinject_List_b_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("a").Concat(__.Inject(p["xx1"]))}}, 
                {"g_injectXListXa_bXcX_concat_XdX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"], "c").Concat("d")}}, 
                {"g_injectXnullX_concat_XinjectX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Concat()}}, 
-               {"g_injectXnull_aX_concat_Xnull_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null, "a").Concat(null, "b")}}, 
+               {"g_injectXnull_aX_concat_Xnull_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null, "a").Concat((string) null, "b")}}, 
                {"g_injectXhello_hiX_concat_XV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("hello", "hi").Concat(__.V().Order().By(T.Id).Values<object>("name"))}}, 
                {"g_V_hasLabel_value_concat_X_X_concat_XpersonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Concat(" ").Concat("person")}}, 
                {"g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").As("a").Constant<object>("Mr.").Concat(__.Select<object>("a"))}}, 
@@ -798,7 +800,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_elementMap", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>()}}, 
                {"g_V_elementMapXname_ageX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>("name", "age")}}, 
                {"g_EX11X_elementMap", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E(p["eid11"]).ElementMap<object>()}}, 
-               {"g_V_elementMapXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>("name", "age", null)}}, 
+               {"g_V_elementMapXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>("name", "age", (string) null)}}, 
                {"g_V_asXaX_flatMapXselectXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a").FlatMap<object>(__.Select<object>("a"))}}, 
                {"g_V_fold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold()}}, 
                {"g_V_fold_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Unfold<object>()}}, 
@@ -1170,8 +1172,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_hasXageX_propertiesXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age").Properties<object>("name").Value<object>()}}, 
                {"g_V_hasXageX_propertiesXname_ageX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age").Properties<object>("name", "age").Value<object>()}}, 
                {"g_V_hasXageX_propertiesXage_nameX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age").Properties<object>("age", "name").Value<object>()}}, 
-               {"g_V_propertiesXname_age_nullX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>("name", "age", null).Value<object>()}}, 
-               {"g_V_valuesXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name", "age", null)}}, 
+               {"g_V_propertiesXname_age_nullX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>("name", "age", (string) null).Value<object>()}}, 
+               {"g_V_valuesXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name", "age", (string) null)}}, 
                {"g_injectX__feature___test__nullX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature  ", "one test ", null, "", " ", " abc", "abc ", " abc ", "  ").RTrim()}}, 
                {"g_injectX__feature___test__nullX_rTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { "  feature  ", " one test ", null, "", " ", " abc", "abc ", " abc ", "  " }).RTrim<object>(Scope.Local)}}, 
                {"g_injectX__feature__X_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("  feature  ").RTrim()}}, 
@@ -1357,7 +1359,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Filter(__.OutE("created")).ValueMap<object, object>(true)}}, 
                {"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMap_withXtokensX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Filter(__.OutE("created")).ValueMap<object, object>().With(WithOptions.Tokens)}}, 
                {"g_VX1X_valueMapXname_locationX_byXunfoldX_by", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).ValueMap<object, object>("name", "location").By(__.Unfold<object>()).By()}}, 
-               {"g_V_valueMapXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("name", "age", null)}}, 
+               {"g_V_valueMapXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("name", "age", (string) null)}}, 
                {"g_V_valueMapXname_ageX_byXisXxXXbyXunfoldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("name", "age").By(__.Is("x")).By(__.Unfold<object>())}}, 
                {"g_VXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(null)}}, 
                {"g_VXlistXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["xx1"])}}, 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index b8e81d76da..273d2b6da8 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -293,6 +293,8 @@ const gremlins = {
     g_E_hasLabelXuses_traversesX: [function({g}) { return g.E().hasLabel("uses", "traverses") }], 
     g_V_hasLabelXperson_software_blahX: [function({g}) { return g.V().hasLabel("person", "software", "blah") }], 
     g_V_hasLabelXpersonX_hasLabelXsoftwareX: [function({g}) { return g.V().hasLabel("person").hasLabel("software") }], 
+    g_V_hasLabelXpersonvarX_hasLabelXsoftwareX: [function({g, xx1}) { return g.V().hasLabel(xx1).hasLabel("software") }], 
+    g_V_hasLabelXpersonvar_softwarevarX: [function({g, xx1, xx2}) { return g.V().hasLabel(xx1, xx2) }], 
     g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name: [function({g}) { return g.V().hasLabel("person").has("age", P.not(P.lte(10).and(P.not(P.between(11, 20)))).and(P.lt(29).or(P.eq(35)))).values("name") }], 
     g_V_hasLabelXnullX: [function({g}) { return g.V().hasLabel(null) }], 
     g_V_hasXlabel_nullX: [function({g}) { return g.V().has(T.label, null) }], 
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 5cddea94f5..044b366215 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -275,6 +275,8 @@ world.gremlins = {
     'g_E_hasLabelXuses_traversesX': [(lambda g:g.E().has_label('uses', 'traverses'))], 
     'g_V_hasLabelXperson_software_blahX': [(lambda g:g.V().has_label('person', 'software', 'blah'))], 
     'g_V_hasLabelXpersonX_hasLabelXsoftwareX': [(lambda g:g.V().has_label('person').has_label('software'))], 
+    'g_V_hasLabelXpersonvarX_hasLabelXsoftwareX': [(lambda g, xx1=None:g.V().has_label(xx1).has_label('software'))], 
+    'g_V_hasLabelXpersonvar_softwarevarX': [(lambda g, xx1=None,xx2=None:g.V().has_label(xx1, xx2))], 
     'g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name': [(lambda g:g.V().has_label('person').has('age', P.not_(P.lte(10).and_(P.not_(P.between(11, 20)))).and_(P.lt(29).or_(P.eq(35)))).values('name'))], 
     'g_V_hasLabelXnullX': [(lambda g:g.V().has_label(None))], 
     'g_V_hasXlabel_nullX': [(lambda g:g.V().has(T.label, None))], 


(tinkerpop) 18/20: wip - refactoring, tests, comments

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b990a4abe6213c0a8d0fec7d6bde532db325e015
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Aug 28 11:29:18 2024 -0400

    wip - refactoring, tests, comments
---
 .../language/grammar/TraversalMethodVisitor.java   |   2 +-
 .../tinkerpop/gremlin/process/traversal/P.java     |   8 +-
 .../gremlin/process/traversal/step/GValue.java     |  73 +++++-------
 .../process/traversal/step/filter/CoinStep.java    |   4 -
 .../process/traversal/step/map/GraphStep.java      |   4 +-
 .../process/traversal/step/map/VertexStep.java     |   2 +-
 .../traversal/step/sideEffect/InjectStep.java      |   2 +-
 .../optimization/InlineFilterStrategy.java         |   2 +-
 .../tinkerpop/gremlin/util/CollectionUtil.java     |  23 +++-
 .../gremlin/process/traversal/step/GValueTest.java | 131 +++++++++++++++++++++
 .../tinkerpop/gremlin/util/CollectionUtilTest.java | 110 +++++++++++++++++
 11 files changed, 301 insertions(+), 60 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index ce010e326e..4d28a0b8e9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -765,7 +765,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
             // if any are GValue then they all need to be GValue to call hasLabel
             if (literalOrVar instanceof GValue || Arrays.stream(literalOrVars).anyMatch(lov -> lov instanceof GValue)) {
                 literalOrVar = GValue.of(literalOrVar);
-                literalOrVars = Arrays.stream(literalOrVars).map(GValue::of).toArray();
+                literalOrVars = GValue.ensureGValues(literalOrVars);
             }
 
             // since we normalized above to gvalue or literal we can just test the first arg for gvalue-ness
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 622a3c3e3a..a878bbb839 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -82,13 +82,7 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
         } else {
             // this might be a bunch of GValue that need to be resolved. zomg
             if (this.value instanceof List) {
-                return this.biPredicate.test(testValue, (V) ((List) this.value).stream().map(o -> {
-                    if (o instanceof GValue) {
-                        return ((GValue) o).get();
-                    } else {
-                        return o;
-                    }
-                }).collect(Collectors.toList()));
+                return this.biPredicate.test(testValue, (V) ((List) this.value).stream().map(GValue::valueOf).collect(Collectors.toList()));
             } else {
                 return this.biPredicate.test(testValue, this.value);
             }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index 0b1e88b15c..cdc5aa6972 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -57,47 +57,6 @@ public class GValue<V> implements Cloneable, Serializable {
         this.value = value;
     }
 
-    /**
-     * The elements in object array argument are examined to see if they are {@link GValue} objects. If they are, they
-     * are preserved as is. If they are not then they are wrapped in a {@link GValue} object.
-     */
-    public static <T> GValue<T>[] convertToGValues(final Object[] args) {
-        return Stream.of(args).map(id -> {
-            if (id instanceof GValue)
-                return (GValue<?>) id;
-            else
-                return of(id);
-        }).toArray(GValue[]::new);
-    }
-
-    /**
-     * Converts {@link GValue} objects arguments to their values to prevent them from leaking to the Graph API.
-     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
-     * objects from leaking to the Graph API.
-     */
-    public static Object[] resolveToValues(final List<GValue<?>> gvalues) {
-        // convert gvalues to array
-        final Object[] newIds = new Object[gvalues.size()];
-        int i = 0;
-        for (final GValue<?> gvalue : gvalues) {
-            newIds[i++] = gvalue.get();
-        }
-        return newIds;
-    }
-
-    /**
-     * Converts {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
-     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
-     * objects from leaking to the Graph API.
-     */
-    public static Object[] resolveToValues(final GValue<?>[] gvalues) {
-        final Object[] newIds = new Object[gvalues.length];
-        for (int i = 0; i < gvalues.length; i++) {
-            newIds[i] = gvalues[i].get();
-        }
-        return newIds;
-    }
-
     /**
      * Determines if the value held by this object was defined as a variable or a literal value. Literal values simply
      * have no name.
@@ -437,4 +396,36 @@ public class GValue<V> implements Cloneable, Serializable {
     public static boolean instanceOfNumber(final Object o) {
         return o instanceof Number || (o instanceof GValue && ((GValue) o).getType().isNumeric());
     }
+
+    /**
+     * The elements in object array argument are examined to see if they are {@link GValue} objects. If they are, they
+     * are preserved as is. If they are not then they are wrapped in a {@link GValue} object.
+     */
+    public static <T> GValue<T>[] ensureGValues(final Object[] args) {
+        return Stream.of(args).map(GValue::of).toArray(GValue[]::new);
+    }
+
+    /**
+     * Converts {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
+     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
+     * objects from leaking to the Graph API.
+     */
+    public static Object[] resolveToValues(final GValue<?>[] gvalues) {
+        final Object[] values = new Object[gvalues.length];
+        for (int i = 0; i < gvalues.length; i++) {
+            values[i] = gvalues[i].get();
+        }
+        return values;
+    }
+
+    /**
+     * Takes an argument that is either a {@code GValue} or an object and if the former returns the child object and
+     * if the latter returns the object itself.
+     */
+    public static Object valueOf(final Object either) {
+        if (either instanceof GValue)
+            return ((GValue<?>) either).get();
+        else
+            return either;
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
index 33b3c80944..5fd63ee3de 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
@@ -39,10 +39,6 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
     private final Random random = new Random();
     private final GValue<Double> probability;
 
-    /**
-     * @deprecated As of release 3.7.3, replaced by {@link #CoinStep(Traversal.Admin, GValue)}
-     */
-    @Deprecated
     public CoinStep(final Traversal.Admin traversal, final double probability) {
         super(traversal);
         this.probability = GValue.ofDouble(probability);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index f65ecb7e81..c009588864 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -70,7 +70,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.returnClass = returnClass;
 
         // if ids is a single collection like g.V(['a','b','c']), then unroll it into an array of ids
-        this.ids = GValue.convertToGValues(tryUnrollSingleCollectionArgument(ids));
+        this.ids = GValue.ensureGValues(tryUnrollSingleCollectionArgument(ids));
 
         this.isStart = isStart;
 
@@ -169,7 +169,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
         this.legacyLogicForPassingNoIds = newIds.length == 1 && ((newIds[0] instanceof List && ((List) newIds[0]).isEmpty()) ||
                 (newIds[0] instanceof GValue && ((GValue) newIds[0]).getType().isCollection() && ((List) ((GValue) newIds[0]).get()).isEmpty()));
 
-        final GValue[] gvalues = GValue.convertToGValues(tryUnrollSingleCollectionArgument(newIds));
+        final GValue[] gvalues = GValue.ensureGValues(tryUnrollSingleCollectionArgument(newIds));
         this.ids = ArrayUtils.addAll(this.ids, gvalues);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
index 896934668d..b6230e0538 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexStep.java
@@ -54,7 +54,7 @@ public class VertexStep<E extends Element> extends FlatMapStep<Vertex, E> implem
     private final Class<E> returnClass;
 
     public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final String... edgeLabels) {
-        this(traversal, returnClass, direction, GValue.convertToGValues(edgeLabels));
+        this(traversal, returnClass, direction, GValue.ensureGValues(edgeLabels));
     }
 
     public VertexStep(final Traversal.Admin traversal, final Class<E> returnClass, final Direction direction, final GValue<String>... edgeLabels) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 73bf40b199..fa27d5af92 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -32,7 +32,7 @@ public final class InjectStep<S> extends StartStep<S> {
     @SafeVarargs
     public InjectStep(final Traversal.Admin traversal, final S... injections) {
         super(traversal);
-        this.injections = GValue.convertToGValues(injections);
+        this.injections = GValue.ensureGValues(injections);
         this.start = new ArrayIterator<>(GValue.resolveToValues(this.injections));
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index ad0ccf395f..e8b154fef6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -158,7 +158,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
                 }
             }
             if (!edgeLabels.isEmpty()) {
-                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), GValue.convertToGValues(edgeLabels.toArray()));
+                final VertexStep<Edge> newVertexStep = new VertexStep<>(traversal, Edge.class, previousStep.getDirection(), GValue.ensureGValues(edgeLabels.toArray()));
                 TraversalHelper.replaceStep(previousStep, newVertexStep, traversal);
                 TraversalHelper.copyLabels(previousStep, newVertexStep, false);
                 if (step.getHasContainers().isEmpty()) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
index 61d9d7573d..27d41d8e18 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
@@ -32,22 +32,36 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * Utility class for working with collections and arrays.
+ */
 public final class CollectionUtil {
-    private CollectionUtil() {
-    }
+    private CollectionUtil() { }
 
+    /**
+     * Converts varargs to a {@code List}.
+     */
     public static <E> List<E> asList(final E... elements) {
         return new ArrayList<>(Arrays.asList(elements));
     }
 
+    /**
+     * Converts varargs to a {@code Set}.
+     */
     public static <E> LinkedHashSet<E> asSet(final E... elements) {
         return asSet(Arrays.asList(elements));
     }
 
+    /**
+     * Converts {@code Collection} to a {@code Set}.
+     */
     public static <E> LinkedHashSet<E> asSet(final Collection<E> elements) {
         return new LinkedHashSet<>(elements);
     }
 
+    /**
+     * Converts varargs to a {@code Map} where the elements are key/value pairs.
+     */
     public static <K,V> LinkedHashMap<K,V> asMap(final Object... elements) {
         final LinkedHashMap<K,V> map = new LinkedHashMap<>();
         for (int i = 0; i < elements.length; i+=2) {
@@ -58,6 +72,11 @@ public final class CollectionUtil {
         return map;
     }
 
+    /**
+     * Clones a given {@code ConcurrentHashMap} by creating a new map and copying all entries from the original map.
+     * If the value of an entry is a {@code Set} or an {@code ArrayList}, a deep copy of the value is created.
+     * Otherwise, the value is copied as is.
+     */
     public static <K,V> ConcurrentHashMap<K,V> clone(final ConcurrentHashMap<K,V> map) {
         final ConcurrentHashMap<K, V> result = new ConcurrentHashMap<>(map.size());
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
index f6aff53c8d..625bfaeb5a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -34,9 +34,11 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
 
@@ -475,4 +477,133 @@ public class GValueTest {
     public void valueInstanceOfNumericShouldReturnFalseForNullObject() {
         assertThat(GValue.valueInstanceOfNumeric(null), is(false));
     }
+
+    @Test
+    public void shouldConvertObjectArrayToGValues() {
+        final Object[] input = {1, "string", true};
+        final GValue<?>[] expected = {GValue.of(1), GValue.of("string"), GValue.of(true)};
+        final GValue<?>[] result = GValue.ensureGValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldPreserveExistingGValuesInArray() {
+        final GValue<Integer> gValue = GValue.of(123);
+        final Object[] input = {gValue, "string"};
+        final GValue<?>[] expected = {gValue, GValue.of("string")};
+        final GValue<?>[] result = GValue.ensureGValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldHandleEmptyArray() {
+        final Object[] input = {};
+        final GValue<?>[] expected = {};
+        final GValue<?>[] result = GValue.ensureGValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldHandleArrayWithNullValues() {
+        final Object[] input = {null, "string"};
+        final GValue<?>[] expected = {GValue.of(null), GValue.of("string")};
+        final GValue<?>[] result = GValue.ensureGValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldResolveGValuesToValues() {
+        final GValue<?>[] input = {GValue.of(1), GValue.of("string"), GValue.of(true)};
+        final Object[] expected = {1, "string", true};
+        final Object[] result = GValue.resolveToValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldHandleEmptyGValuesArray() {
+        final GValue<?>[] input = {};
+        final Object[] expected = {};
+        final Object[] result = GValue.resolveToValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldHandleGValuesArrayWithNullValues() {
+        final GValue<?>[] input = {GValue.of(null), GValue.of("string")};
+        final Object[] expected = {null, "string"};
+        final Object[] result = GValue.resolveToValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void shouldHandleMixedTypeGValuesArray() {
+        final GValue<?>[] input = {GValue.of(1), GValue.of("string"), GValue.of(true), GValue.of(123.45)};
+        final Object[] expected = {1, "string", true, 123.45};
+        final Object[] result = GValue.resolveToValues(input);
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void equalsShouldReturnTrueForSameObject() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertEquals(true, gValue.equals(gValue));
+    }
+
+    @Test
+    public void equalsShouldReturnFalseForNull() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertEquals(false, gValue.equals(null));
+    }
+
+    @Test
+    public void equalsShouldReturnFalseForDifferentClass() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertEquals(false, gValue.equals("string"));
+    }
+
+    @Test
+    public void equalsShouldReturnTrueForEqualGValues() {
+        final GValue<Integer> gValue1 = GValue.of(123);
+        final GValue<Integer> gValue2 = GValue.of(123);
+        assertEquals(true, gValue1.equals(gValue2));
+    }
+
+    @Test
+    public void equalsShouldReturnFalseForDifferentNames() {
+        final GValue<Integer> gValue1 = GValue.of("name1", 123);
+        final GValue<Integer> gValue2 = GValue.of("name2", 123);
+        assertEquals(false, gValue1.equals(gValue2));
+    }
+
+    @Test
+    public void equalsShouldReturnFalseForDifferentTypes() {
+        final GValue<Integer> gValue1 = GValue.of(123);
+        final GValue<String> gValue2 = GValue.of("123");
+        assertEquals(false, gValue1.equals(gValue2));
+    }
+
+    @Test
+    public void equalsShouldReturnFalseForDifferentValues() {
+        final GValue<Integer> gValue1 = GValue.of(123);
+        final GValue<Integer> gValue2 = GValue.of(456);
+        assertEquals(false, gValue1.equals(gValue2));
+    }
+
+    @Test
+    public void valueOfShouldReturnGValueValue() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertEquals(123, GValue.valueOf(gValue));
+    }
+
+    @Test
+    public void valueOfShouldReturnObjectAsIs() {
+        final String value = "test";
+        assertEquals("test", GValue.valueOf(value));
+    }
+
+    @Test
+    public void valueOfShouldReturnNullForNullInput() {
+        assertNull(GValue.valueOf(null));
+        assertNull(null);
+    }
 }
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java
index 73bd39b415..7b938c1a22 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java
@@ -22,10 +22,20 @@ import org.apache.tinkerpop.gremlin.AssertHelper;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 public class CollectionUtilTest {
@@ -70,4 +80,104 @@ public class CollectionUtilTest {
         final ConcurrentHashMap<?, ?> cloned = CollectionUtil.clone(source);
         assertTrue(source.equals(cloned));
     }
+
+    @Test
+    public void shouldCloneEmptyConcurrentHashMap() {
+        final ConcurrentHashMap<String, String> source = new ConcurrentHashMap<>();
+        final ConcurrentHashMap<?, ?> cloned = CollectionUtil.clone(source);
+        assertTrue(source.equals(cloned));
+    }
+
+    @Test
+    public void shouldCloneConcurrentHashMapWithMixedTypes() {
+        final ConcurrentHashMap<String, Object> source = new ConcurrentHashMap<>();
+        source.put("key1", "value1");
+        source.put("key2", new ArrayList<>(Arrays.asList("a", "b")));
+        source.put("key3", new HashSet<>(Arrays.asList("x", "y")));
+
+        final ConcurrentHashMap<?, ?> cloned = CollectionUtil.clone(source);
+        assertTrue(source.equals(cloned));
+    }
+
+    @Test
+    public void shouldAddFirstWhenBothArgumentsNull() {
+        String[] result = CollectionUtil.addFirst(null, null, String.class);
+        assertArrayEquals(new String[]{null}, result);
+    }
+
+    @Test
+    public void shouldAddFirstWhenArrayNull() {
+        String[] result = CollectionUtil.addFirst(null, "element", String.class);
+        assertArrayEquals(new String[]{"element"}, result);
+    }
+
+    @Test
+    public void shoulAddFirstWhenNeitherArgumentNull() {
+        Integer[] array = {1, 2, 3};
+        Integer[] result = CollectionUtil.addFirst(array, 0, Integer.class);
+        assertArrayEquals(new Integer[]{0, 1, 2, 3}, result);
+    }
+
+    @Test
+    public void shouldAddFirstWhenEmptyArray() {
+        String[] array = {};
+        String[] result = CollectionUtil.addFirst(array, "element", String.class);
+        assertArrayEquals(new String[]{"element"}, result);
+    }
+
+    @Test
+    public void shouldAddFirstWhenIntegers() {
+        Integer[] array = {1, 2, 3};
+        Integer[] result = CollectionUtil.addFirst(array, 0, Integer.class);
+        assertArrayEquals(new Integer[]{0, 1, 2, 3}, result);
+    }
+
+    @Test
+    public void shouldConvertVarargsToList() {
+        List<String> result = CollectionUtil.asList("a", "b", "c");
+        assertEquals(Arrays.asList("a", "b", "c"), result);
+    }
+
+    @Test
+    public void shouldConvertEmptyVarargsToList() {
+        List<String> result = CollectionUtil.asList();
+        assertEquals(Collections.emptyList(), result);
+    }
+
+    @Test
+    public void shouldConvertVarargsToSet() {
+        Set<String> result = CollectionUtil.asSet("a", "b", "c");
+        assertEquals(new LinkedHashSet<>(Arrays.asList("a", "b", "c")), result);
+    }
+
+    @Test
+    public void shouldConvertEmptyVarargsToSet() {
+        Set<String> result = CollectionUtil.asSet();
+        assertEquals(new LinkedHashSet<>(), result);
+    }
+
+    @Test
+    public void shouldConvertCollectionToSet() {
+        Collection<String> collection = Arrays.asList("a", "b", "c");
+        Set<String> result = CollectionUtil.asSet(collection);
+        assertEquals(new LinkedHashSet<>(collection), result);
+    }
+
+    @Test
+    public void shouldConvertVarargsToMap() {
+        Map<String, String> result = CollectionUtil.asMap("key1", "value1", "key2", "value2");
+        Map<String, String> expected = new LinkedHashMap<>();
+        expected.put("key1", "value1");
+        expected.put("key2", "value2");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void shouldConvertVarargsToMapWithOddNumberOfElements() {
+        Map<String, String> result = CollectionUtil.asMap("key1", "value1", "key2");
+        Map<String, String> expected = new LinkedHashMap<>();
+        expected.put("key1", "value1");
+        expected.put("key2", null);
+        assertEquals(expected, result);
+    }
 }


(tinkerpop) 12/20: wip - refactoring to use GValue static methods for instanceOf checks

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c83e12b1317013af4a28e2c14be16f9502315dfb
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Aug 26 12:50:30 2024 -0400

    wip - refactoring to use GValue static methods for instanceOf checks
---
 .../apache/tinkerpop/gremlin/process/traversal/step/GValue.java    | 1 -
 .../gremlin/process/traversal/step/util/HasContainer.java          | 4 ++--
 .../traversal/strategy/optimization/InlineFilterStrategy.java      | 7 ++-----
 gremlin-go/driver/cucumber/gremlin.go                              | 2 ++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index f7692d6866..cb18dec8b9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -367,7 +367,6 @@ public class GValue<V> implements Cloneable, Serializable {
      * {@link GType}.
      */
     public static boolean instanceOf(final Object o, final GType type) {
-        // todo: is this right for null?
         if (null == o)
             return false;
         else if (o instanceof GValue)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
index d456b09df6..35689f8367 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
@@ -156,11 +156,11 @@ public class HasContainer implements Serializable, Cloneable, Predicate<Element>
             if (predicateValue instanceof Collection) {
                 final Collection collection = (Collection) predicateValue;
                 if (!collection.isEmpty()) {
-                    return ((Collection) predicateValue).stream().allMatch(c -> null == c || c instanceof String || (c instanceof GValue && ((GValue) c).getType() == GType.STRING));
+                    return ((Collection) predicateValue).stream().allMatch(c -> null == c || GValue.instanceOf(c, GType.STRING));
                 }
             }
 
-            return predicateValue instanceof String || (predicateValue instanceof GValue && ((GValue) predicateValue).getType() == GType.STRING);
+            return GValue.instanceOf(predicateValue, GType.STRING);
         }
 
         return false;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index 5ff63b3e0f..f7ff96009d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -129,9 +129,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
             final List<Object> edgeLabels = new ArrayList<>();
             for (final HasContainer hasContainer : new ArrayList<>(step.getHasContainers())) {
                 if (hasContainer.getKey().equals(T.label.getAccessor())) {
-                    if (hasContainer.getBiPredicate() == Compare.eq &&
-                            (hasContainer.getValue() instanceof String ||
-                                    (hasContainer.getValue() instanceof GValue && ((GValue) hasContainer.getValue()).getType() == GType.STRING)) &&
+                    if (hasContainer.getBiPredicate() == Compare.eq && GValue.instanceOf(hasContainer.getValue(), GType.STRING) &&
                             edgeLabels.isEmpty()) {
                         edgeLabels.add(hasContainer.getValue());
                         step.removeHasContainer(hasContainer);
@@ -145,8 +143,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
                         final List<P<?>> orps = ((OrP) hasContainer.getPredicate()).getPredicates();
                         final List<Object> newEdges = new ArrayList<>();
                         for (int i = 0; i < orps.size(); i++) {
-                            if (orps.get(i).getBiPredicate() == Compare.eq && (orps.get(i).getValue() instanceof String ||
-                                    (orps.get(i).getValue() instanceof GValue && ((GValue) orps.get(i).getValue()).getType() == GType.STRING)))
+                            if (orps.get(i).getBiPredicate() == Compare.eq && GValue.instanceOf(orps.get(i).getValue(), GType.STRING))
                                 newEdges.add(orps.get(i).getValue());
                             else {
                                 removeContainer = false;
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index 55feb35dfe..449783b0f4 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -272,6 +272,8 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_E_hasLabelXuses_traversesX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("uses", "traverses")}}, 
     "g_V_hasLabelXperson_software_blahX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person", "software", "blah")}}, 
     "g_V_hasLabelXpersonX_hasLabelXsoftwareX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").HasLabel("software")}}, 
+    "g_V_hasLabelXpersonvarX_hasLabelXsoftwareX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel(p["xx1"]).HasLabel("software")}}, 
+    "g_V_hasLabelXpersonvar_softwarevarX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel(p["xx1"], p["xx2"])}}, 
     "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Has("age", gremlingo.P.Not(gremlingo.P.Lte(10).And(gremlingo.P.Not(gremlingo.P.Between(11, 20)))).And(gremlingo.P.Lt(29).Or(gremlingo.P.Eq(35)))).Values("name")}}, 
     "g_V_hasLabelXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel(nil)}}, 
     "g_V_hasXlabel_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has(gremlingo.T.Label, nil)}}, 


(tinkerpop) 04/20: wip

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 41c2c36cf31245712e21733426641222bc90daf6
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Aug 7 15:06:28 2024 -0400

    wip
---
 .../grammar/DefaultGremlinBaseVisitor.java         |  12 +--
 .../language/grammar/TraversalMethodVisitor.java   | 100 ++++++++++--------
 .../grammar/TraversalSourceSpawnMethodVisitor.java |  15 ++-
 .../translator/DotNetTranslateVisitor.java         |  23 ++--
 .../language/translator/TranslateVisitor.java      |   5 -
 .../traversal/dsl/graph/GraphTraversal.java        | 117 ++++++++++++++++++++-
 .../traversal/dsl/graph/GraphTraversalSource.java  |  32 +++++-
 .../gremlin/process/traversal/step/GValue.java     |   9 +-
 .../process/traversal/step/map/AddEdgeStep.java    |   9 +-
 .../process/traversal/step/map/CallStep.java       |  36 +++++--
 .../process/traversal/step/map/ConstantStep.java   |   2 +-
 .../process/traversal/step/map/DifferenceStep.java |  16 ++-
 .../process/traversal/step/map/DisjunctStep.java   |  12 ++-
 .../process/traversal/step/map/ProductStep.java    |  15 ++-
 .../traversal/step/sideEffect/InjectStep.java      |   2 +-
 .../strategy/decoration/SideEffectStrategy.java    |   7 +-
 gremlin-language/src/main/antlr4/Gremlin.g4        |   7 +-
 .../tinkerpop/gremlin/features/StepDefinition.java |  18 +++-
 18 files changed, 324 insertions(+), 113 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
index 3bfb22d17b..f32e40e44b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
@@ -414,11 +414,11 @@ public class DefaultGremlinBaseVisitor<T> extends AbstractParseTreeVisitor<T> im
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_from_Traversal(final GremlinParser.TraversalMethod_from_TraversalContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_from_Traversal(final GremlinParser.TraversalMethod_from_TraversalContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
@@ -854,11 +854,11 @@ public class DefaultGremlinBaseVisitor<T> extends AbstractParseTreeVisitor<T> im
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_to_Traversal(final GremlinParser.TraversalMethod_to_TraversalContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_to_Traversal(final GremlinParser.TraversalMethod_to_TraversalContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
@@ -1395,10 +1395,6 @@ public class DefaultGremlinBaseVisitor<T> extends AbstractParseTreeVisitor<T> im
 	 * {@inheritDoc}
 	 */
 	@Override public T visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index fe500e6210..daf72820d4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -25,14 +25,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality;
 
-import java.util.Collection;
 import java.util.Map;
 import java.util.function.BiFunction;
 
-import static org.apache.tinkerpop.gremlin.process.traversal.SackFunctions.Barrier.normSack;
-
 /**
  * Specific case of TraversalRootVisitor where all TraversalMethods returns
  * a GraphTraversal object.
@@ -535,7 +533,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_difference_Object(final GremlinParser.TraversalMethod_difference_ObjectContext ctx) {
-        return graphTraversal.difference(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.difference((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.difference(literalOrVar);
     }
 
     /**
@@ -543,7 +545,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_disjunct_Object(final GremlinParser.TraversalMethod_disjunct_ObjectContext ctx) {
-        return graphTraversal.disjunct(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.disjunct((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.disjunct(literalOrVar);
     }
 
     /**
@@ -640,8 +646,22 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversal visitTraversalMethod_from_String(final GremlinParser.TraversalMethod_from_StringContext ctx) {
-        return graphTraversal.from(antlr.argumentVisitor.parseString(ctx.stringArgument()));
+    public Traversal visitTraversalMethod_from_String(final GremlinParser.TraversalMethod_from_StringContext ctx) {
+        return graphTraversal.from(antlr.genericVisitor.parseString(ctx.stringLiteral()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Traversal visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) {
+        final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
+        if (literalOrVar instanceof Vertex)
+            return graphTraversal.from((Vertex) literalOrVar);
+        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.VERTEX)
+            return graphTraversal.from((GValue<Vertex>) literalOrVar);
+        else
+            throw new IllegalArgumentException("from argument must be a vertex");
     }
 
     /**
@@ -1162,15 +1182,6 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
             return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (Map) literalOrVar);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GraphTraversal visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) {
-        return this.graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()),
-                antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1298,7 +1309,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_product_Object(final GremlinParser.TraversalMethod_product_ObjectContext ctx) {
-        return graphTraversal.product(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isCollection())
+            return graphTraversal.product((GValue<Object>) literalOrVar);
+        else
+            return graphTraversal.product(literalOrVar);
     }
 
     /**
@@ -1641,7 +1656,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public GraphTraversal visitTraversalMethod_to_Direction_String(final GremlinParser.TraversalMethod_to_Direction_StringContext ctx) {
-        return graphTraversal.to(antlr.argumentVisitor.parseDirection(ctx.traversalDirectionArgument()),
+        return graphTraversal.to(TraversalEnumParser.parseTraversalDirectionFromContext(ctx.traversalDirection()),
                 antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
@@ -1649,8 +1664,22 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversal visitTraversalMethod_to_String(final GremlinParser.TraversalMethod_to_StringContext ctx) {
-        return graphTraversal.to(antlr.argumentVisitor.parseString(ctx.stringArgument()));
+    public Traversal visitTraversalMethod_to_String(final GremlinParser.TraversalMethod_to_StringContext ctx) {
+        return graphTraversal.to(antlr.genericVisitor.parseString(ctx.stringLiteral()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Traversal visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) {
+        final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
+        if (literalOrVar instanceof Vertex)
+            return graphTraversal.to((Vertex) literalOrVar);
+        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.VERTEX)
+            return graphTraversal.to((GValue<Vertex>) literalOrVar);
+        else
+            throw new IllegalArgumentException("from argument must be a vertex");
     }
 
     /**
@@ -1789,22 +1818,6 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Traversal visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) {
-        return graphTraversal.from(antlr.argumentVisitor.parseVertex(ctx.structureVertexArgument()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Traversal visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) {
-        return graphTraversal.to(antlr.argumentVisitor.parseVertex(ctx.structureVertexArgument()));
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1826,8 +1839,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public Traversal visitTraversalMethod_call_string_map(final GremlinParser.TraversalMethod_call_string_mapContext ctx) {
-        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
-                                   antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
+        else
+            return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar);
     }
 
     /**
@@ -1844,9 +1860,11 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
      */
     @Override
     public Traversal visitTraversalMethod_call_string_map_traversal(final GremlinParser.TraversalMethod_call_string_map_traversalContext ctx) {
-        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
-                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()),
-                antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        else
+            return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
index 8e5ba3ded2..bedf28d487 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
@@ -177,8 +177,11 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map(final GremlinParser.TraversalSourceSpawnMethod_call_string_mapContext ctx) {
-        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
-                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
+        else
+            return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar);
     }
 
     /**
@@ -195,9 +198,11 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map_traversal(final GremlinParser.TraversalSourceSpawnMethod_call_string_map_traversalContext ctx) {
-        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
-                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()),
-                anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
+        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+            return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        else
+            return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
index e9d38f13b8..717fc536cb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
@@ -878,16 +878,19 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
     }
 
     @Override
-    public Void visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) {
-        // call is ambiguous without an explicit cast
-        visit(ctx.getChild(0));
-        sb.append("(");
-        visit(ctx.traversalMergeArgument());
-        sb.append(", ");
-        sb.append("(ITraversal) ");
-        visit(ctx.nestedTraversal());
-        sb.append(")");
-        return null;
+    public Void visitTraversalMethod_option_Object_Traversal(final GremlinParser.TraversalMethod_option_Object_TraversalContext ctx) {
+        if (ctx.genericLiteralArgument().genericLiteral().traversalMerge() != null) {
+            visit(ctx.getChild(0));
+            sb.append("(");
+            visit(ctx.genericLiteralArgument());
+            sb.append(", ");
+            sb.append("(ITraversal) ");
+            visit(ctx.nestedTraversal());
+            sb.append(")");
+            return null;
+        } else {
+            return super.visitTraversalMethod_option_Object_Traversal(ctx);
+        }
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/TranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/TranslateVisitor.java
index 00a8523b45..553ae00be7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/TranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/TranslateVisitor.java
@@ -902,11 +902,6 @@ public class TranslateVisitor extends AbstractParseTreeVisitor<Void> implements
         return visitChildren(ctx);
     }
 
-    @Override
-    public Void visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) {
-        return visitChildren(ctx);
-    }
-
     @Override
     public Void visitTraversalMethod_option_Object_Traversal(final GremlinParser.TraversalMethod_option_Object_TraversalContext ctx) {
         return visitChildren(ctx);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 5a3bb2dd8f..506d757d7c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -550,6 +550,30 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
             return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
         }
 
+        /**
+         * Calculates the difference between the list traverser and list argument.
+         *
+         * @return the traversal with an appended {@link DifferenceStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#difference-step" target="_blank">Reference Documentation - Difference Step</a>
+         * @since 3.7.1
+         */
+        public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values);
+            return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
+        }
+
+        /**
+         * Calculates the disjunction between the list traverser and list argument.
+         *
+         * @return the traversal with an appended {@link DisjunctStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#disjunct-step" target="_blank">Reference Documentation - Disjunct Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values);
+            return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
+        }
+
         /**
          * Calculates the intersection between the list traverser and list argument.
          *
@@ -567,13 +591,98 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
          *
          * @return the traversal with an appended {@link TraversalMergeStep}.
          * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
-         * @since 3.7.1
+         * @since 3.7.3
          */
         public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) {
             this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values);
             return this.asAdmin().addStep(new TraversalMergeStep<>(this.asAdmin(), values));
         }
 
+        /**
+         * Calculates the cartesian product between the list traverser and list argument.
+         *
+         * @return the traversal with an appended {@link ProductStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#product-step" target="_blank">Reference Documentation - Product Step</a>
+         * @since 3.7.3
+         */
+        public default GraphTraversal<S, List<List<?>>> product(final GValue<Object> values) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.product, values);
+            return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
+        }
+
+        /**
+         * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
+         * incoming vertex of the newly added {@link Edge}.
+         *
+         * @param toVertex the vertex for selecting the incoming vertex
+         * @return the traversal with the modified {@link AddEdgeStep}
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
+         * @since 4.0.0
+         */
+        public default GraphTraversal<S, E> to(final GValue<Vertex> toVertex) {
+            final Step<?,?> prev = this.asAdmin().getEndStep();
+            if (!(prev instanceof FromToModulating))
+                throw new IllegalArgumentException(String.format(
+                        "The to() step cannot follow %s", prev.getClass().getSimpleName()));
+
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, toVertex);
+            ((FromToModulating) prev).addTo(__.constant(toVertex).asAdmin());
+            return this;
+        }
+
+        /**
+         * When used as a modifier to {@link #addE(String)} this method specifies the traversal to use for selecting the
+         * outgoing vertex of the newly added {@link Edge}.
+         *
+         * @param fromVertex the vertex for selecting the outgoing vertex
+         * @return the traversal with the modified {@link AddEdgeStep}
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
+         * @since 4.0.0
+         */
+        public default GraphTraversal<S, E> from(final GValue<Vertex> fromVertex) {
+            final Step<?,?> prev = this.asAdmin().getEndStep();
+            if (!(prev instanceof FromToModulating))
+                throw new IllegalArgumentException(String.format(
+                        "The from() step cannot follow %s", prev.getClass().getSimpleName()));
+
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.from, fromVertex);
+            ((FromToModulating) prev).addFrom(__.constant(fromVertex).asAdmin());
+            return this;
+        }
+
+        /**
+         * Perform the specified service call with the specified static parameters.
+         *
+         * @param service the name of the service call
+         * @param params static parameter map (no nested traversals)
+         * @return the traversal with an appended {@link CallStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
+         * @since 4.0.0
+         */
+        default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params);
+            final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params);
+            return this.asAdmin().addStep(call);
+        }
+        /**
+         * Perform the specified service call with both static and dynamic parameters produced by the specified child
+         * traversal. These parameters will be merged at execution time per the provider implementation. Reference
+         * implementation merges dynamic into static (dynamic will overwrite static).
+         *
+         * @param service the name of the service call
+         * @param params static parameter map (no nested traversals)
+         * @param childTraversal a traversal that will produce a Map of parameters for the service call when invoked.
+         * @return the traversal with an appended {@link CallStep}.
+         * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#call-step" target="_blank">Reference Documentation - Call Step</a>
+         * @since 4.0.0
+         */
+        default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) {
+            this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal);
+            final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service, params) :
+                    new CallStep(this.asAdmin(), false, service, params, childTraversal.asAdmin());
+            return this.asAdmin().addStep(step);
+        }
+
         @Override
         public default <E2> GraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
             return (GraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
@@ -2718,8 +2827,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     public default GraphTraversal<S, E> hasId(final Object id, final Object... otherIds) {
         if (id instanceof P) {
             return this.hasId((P) id);
-        }
-        else {
+        } else {
             this.asAdmin().getGremlinLang().addStep(Symbols.hasId, id, otherIds);
 
             //using ArrayList given P.within() turns all arguments into lists
@@ -2730,8 +2838,9 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
                 // as ids are unrolled when it's in array, they should also be unrolled when it's a list.
                 // this also aligns with behavior of hasId() when it's pushed down to g.V() (TINKERPOP-2863)
                 ids.addAll((Collection<?>) id);
-            } else
+            } else {
                 ids.add(id);
+            }
 
             // unrolling ids from lists works cleaner with Collection too, as otherwise they will need to
             // be turned into array first
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 7c221d0ef8..61081d91e5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -632,6 +632,36 @@ public class GraphTraversalSource implements TraversalSource {
      */
     public class Admin {
 
+        /**
+         * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
+         * static parameters.
+         *
+         * @param service the name of the service call
+         * @param params static parameter map (no nested traversals)
+         * @since 4.0.0
+         */
+        public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params) {
+            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+            clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+            final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
+            return traversal.addStep(new CallStep<>(traversal, true, service, params));
+        }
+
+        /**
+         * Spawns a {@link GraphTraversal} starting with values produced by the specified service call with the specified
+         * static parameters.
+         *
+         * @param service the name of the service call
+         * @param params static parameter map (no nested traversals)
+         * @since 4.0.0
+         */
+        public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params, final Traversal<S, Map> childTraversal) {
+            final GraphTraversalSource clone = GraphTraversalSource.this.clone();
+            clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params);
+            final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone);
+            return traversal.addStep(new CallStep<>(traversal, true, service, params, childTraversal.asAdmin()));
+        }
+
         /**
          * Spawns a {@link GraphTraversal} by doing a merge (i.e. upsert) style operation for an {@link Vertex} using a
          * {@code Map} as an argument. The {@code Map} represents search criteria and will match each of the supplied
@@ -639,7 +669,7 @@ public class GraphTraversalSource implements TraversalSource {
          * made it will use that search criteria to create the new {@link Vertex}.
          *
          * @param searchCreate This {@code Map} can have a key of {@link T} or a {@code String}.
-         * @since 3.6.0
+         * @since 4.0.0
          */
         public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) {
             final GraphTraversalSource clone = GraphTraversalSource.this.clone();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index e05a9e91f4..41caaea1a2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -79,6 +79,13 @@ public class GValue<V> implements Cloneable, Serializable {
         return this.type;
     }
 
+    /**
+     * Determines if the value held is of a {@code null} value.
+     */
+    public boolean isNull() {
+        return this.value == null;
+    }
+
     /**
      * Gets the value.
      */
@@ -96,7 +103,7 @@ public class GValue<V> implements Cloneable, Serializable {
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        GValue<?> gValue = (GValue<?>) o;
+        final GValue<?> gValue = (GValue<?>) o;
         return Objects.equals(name, gValue.name) && type == gValue.type && Objects.equals(value, gValue.value);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
index 9dfa4ce754..82c7f3893b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.FromToModulating;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
@@ -113,7 +114,7 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theTo instanceof Vertex))
+        if (!(theTo instanceof Vertex) && (theTo instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theTo ? "null" : theTo.getClass().getSimpleName()));
@@ -127,13 +128,13 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theFrom instanceof Vertex))
+        if (!(theFrom instanceof Vertex) && (theFrom instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theFrom ? "null" : theFrom.getClass().getSimpleName()));
 
-        Vertex toVertex = (Vertex) theTo;
-        Vertex fromVertex = (Vertex) theFrom;
+        Vertex toVertex = theTo instanceof Vertex ? (Vertex) theTo : ((GValue<Vertex>) theTo).get();
+        Vertex fromVertex = theFrom instanceof Vertex ? (Vertex) theFrom : ((GValue<Vertex>) theFrom).get();
 
         if (toVertex instanceof Attachable)
             toVertex = ((Attachable<Vertex>) toVertex)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
index 2435be373c..3dd99d1703 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
@@ -62,7 +63,7 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     private ServiceCallContext ctx;
     private String serviceName;
     private Service<S, E> service;
-    private Map staticParams;
+    private GValue<Map> staticParams;
     private Traversal.Admin<S,Map> mapTraversal;
     private Parameters parameters;
 
@@ -74,20 +75,29 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     }
 
     public CallStep(final Traversal.Admin traversal, final boolean isStart, final String service) {
-        this(traversal, isStart, service, null);
+        this(traversal, isStart, service, (Map) null);
     }
 
     public CallStep(final Traversal.Admin traversal, final boolean isStart, final String service, final Map staticParams) {
+        this(traversal, isStart, service, GValue.ofMap(staticParams));
+    }
+
+    public CallStep(final Traversal.Admin traversal, final boolean isStart, final String service, final GValue<Map> staticParams) {
         this(traversal, isStart, service, staticParams, null);
     }
 
     public CallStep(final Traversal.Admin traversal, final boolean isStart, final String service, final Map staticParams,
                     final Traversal.Admin<S, Map> mapTraversal) {
+        this(traversal, isStart, service, GValue.ofMap(staticParams), mapTraversal);
+    }
+
+    public CallStep(final Traversal.Admin traversal, final boolean isStart, final String service, final GValue<Map> staticParams,
+                    final Traversal.Admin<S, Map> mapTraversal) {
         super(traversal);
 
         this.isStart = isStart;
         this.serviceName = service;
-        this.staticParams = staticParams == null ? new LinkedHashMap() : staticParams;
+        this.staticParams = staticParams == null || staticParams.isNull() ? GValue.ofMap(staticParams.getName(), new LinkedHashMap()) : staticParams;
         this.mapTraversal = mapTraversal == null ? null : integrateChild(mapTraversal);
         this.parameters = new Parameters();
         this.ctx = new ServiceCallContext(traversal, this);
@@ -95,13 +105,17 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
 
     protected Service<S, E> service() {
         // throws exception for unrecognized service
-        return service != null ? service : (service = getServiceRegistry().get(serviceName, isStart, staticParams));
+        return service != null ? service : (service = getServiceRegistry().get(serviceName, isStart, staticParams.get()));
     }
 
     public String getServiceName() {
         return serviceName;
     }
 
+    public GValue<Map> getStaticParams() {
+        return staticParams;
+    }
+
     @Override
     protected Traverser.Admin<E> processNextStart() {
         if (isStart && first) {
@@ -199,7 +213,7 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     public Map getMergedParams() {
         if (mapTraversal == null && parameters.isEmpty()) {
             // static params only
-            return Collections.unmodifiableMap(this.staticParams);
+            return Collections.unmodifiableMap(this.staticParams.get());
         }
 
         return getMergedParams(new DummyTraverser(this.traversal.getTraverserGenerator()));
@@ -208,11 +222,11 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     protected Map getMergedParams(final Traverser.Admin<S> traverser) {
         if (mapTraversal == null && parameters.isEmpty()) {
             // static params only
-            return Collections.unmodifiableMap(this.staticParams);
+            return Collections.unmodifiableMap(this.staticParams.get());
         }
 
         // merge dynamic with static params
-        final Map params = new LinkedHashMap(this.staticParams);
+        final Map params = new LinkedHashMap(this.staticParams.get());
         if (mapTraversal != null) params.putAll(TraversalUtil.apply(traverser, mapTraversal));
         final Object[] kvs = this.parameters.getKeyValues(traverser);
         for (int i = 0; i < kvs.length; i += 2) {
@@ -225,7 +239,7 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     protected Map getMergedParams(final TraverserSet<S> traverserSet) {
         if (mapTraversal == null && parameters.isEmpty()) {
             // static params only
-            return Collections.unmodifiableMap(this.staticParams);
+            return Collections.unmodifiableMap(this.staticParams.get());
         }
 
         /*
@@ -302,7 +316,7 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     public String toString() {
         final ArrayList args = new ArrayList();
         args.add(serviceName);
-        if (!staticParams.isEmpty())
+        if (!staticParams.get().isEmpty())
             args.add(staticParams);
         if (mapTraversal != null)
             args.add(mapTraversal);
@@ -314,8 +328,8 @@ public final class CallStep<S, E> extends AbstractStep<S, E> implements Traversa
     @Override
     public int hashCode() {
         int hashCode = super.hashCode() ^ Objects.hashCode(this.serviceName);
-        if (!staticParams.isEmpty())
-            hashCode ^= staticParams.hashCode();
+        if (!staticParams.get().isEmpty())
+            hashCode ^= staticParams.get().hashCode();
         if (mapTraversal != null)
             hashCode ^= mapTraversal.hashCode();
         if (!parameters.isEmpty())
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 245a443e5a..2145f7e966 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -33,7 +33,7 @@ public class ConstantStep<S, E> extends ScalarMapStep<S, E> {
     private final GValue<E> constant;
 
     public ConstantStep(final Traversal.Admin traversal, final E constant) {
-        this(traversal, GValue.of(constant));
+        this(traversal, constant instanceof GValue ? (GValue) constant : GValue.of(constant));
     }
 
     public ConstantStep(final Traversal.Admin traversal, final GValue<E> constant) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
index 1317f931c4..87f44f8639 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -36,24 +37,33 @@ import java.util.Set;
  */
 public final class DifferenceStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
+
     public DifferenceStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
 
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(values);
         }
     }
 
+    public Traversal.Admin<S,E> getValueTraversal() {
+        return this.valueTraversal;
+    }
+
+    public GValue<Object> getParameterItems() {
+        return parameterItems;
+    }
+
     @Override
     public String getStepName() { return "difference"; }
 
     @Override
     protected Set<?> map(Traverser.Admin<S> traverser) {
         final Collection setA = convertTraverserToCollection(traverser);
-        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems.get());
         final Set differenceSet = new HashSet();
 
         for (Object element : setA) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
index 60eebf0457..fc890dd2a2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -35,14 +36,15 @@ import java.util.Set;
  */
 public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
+
     public DisjunctStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
 
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(values);
         }
     }
 
@@ -50,8 +52,8 @@ public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implement
         return this.valueTraversal;
     }
 
-    public Object getParameterItems() {
-        return this.parameterItems;
+    public GValue<Object> getParameterItems() {
+        return parameterItems;
     }
 
     @Override
@@ -60,7 +62,7 @@ public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implement
     @Override
     protected Set<?> map(Traverser.Admin<S> traverser) {
         final Set setA = convertTraverserToSet(traverser);
-        final Set setB = (null != valueTraversal) ? convertTraversalToSet(traverser, this.valueTraversal) : convertArgumentToSet(parameterItems);
+        final Set setB = (null != valueTraversal) ? convertTraversalToSet(traverser, this.valueTraversal) : convertArgumentToSet(parameterItems.get());
         final Set disjunctSet = new HashSet();
 
         if (setA.size() == 0) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
index b14c02ba92..4842a313bb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
@@ -36,7 +37,7 @@ import java.util.Set;
  */
 public final class ProductStep<S, E> extends ScalarMapStep<S, List<List<?>>> implements TraversalParent, ListFunction {
     private Traversal.Admin<S, E> valueTraversal;
-    private Object parameterItems;
+    private GValue<Object> parameterItems;
 
     public ProductStep(final Traversal.Admin traversal, final Object values) {
         super(traversal);
@@ -44,17 +45,25 @@ public final class ProductStep<S, E> extends ScalarMapStep<S, List<List<?>>> imp
         if (values instanceof Traversal) {
             valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
         } else {
-            parameterItems = values;
+            parameterItems = values instanceof GValue ? (GValue<Object>) values : GValue.of(values);
         }
     }
 
+    public Traversal.Admin<S,E> getValueTraversal() {
+        return this.valueTraversal;
+    }
+
+    public GValue<Object> getParameterItems() {
+        return parameterItems;
+    }
+
     @Override
     public String getStepName() { return "product"; }
 
     @Override
     protected List<List<?>> map(Traverser.Admin<S> traverser) {
         final Collection listA = convertTraverserToCollection(traverser);
-        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems.get());
         final List elements = new ArrayList();
 
         for (Object elementInA : listA) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index ab57c05ce5..cc3a970f93 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -39,7 +39,7 @@ public final class InjectStep<S> extends StartStep<S> {
     @Override
     public InjectStep<S> clone() {
         final InjectStep<S> clone = (InjectStep<S>) super.clone();
-        clone.start = new ArrayIterator<>(clone.injections);
+        clone.start = new ArrayIterator<>(resolveToValues(clone.injections));
         return clone;
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SideEffectStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SideEffectStrategy.java
index ce794b8b6a..9b309dba3f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SideEffectStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SideEffectStrategy.java
@@ -22,6 +22,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
 import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
@@ -60,7 +61,11 @@ public final class SideEffectStrategy extends AbstractTraversalStrategy<Traversa
             strategy = cloneStrategy;
             traversalStrategies.addStrategies(strategy);
         }
-        strategy.sideEffects.add(new Triplet<>(key, value instanceof Supplier ? (Supplier) value : new ConstantSupplier<>(value), reducer));
+
+        // don't want the GValue to leak beyond strategy application or else the Supplier will start producing it
+        // during execution
+        final ConstantSupplier initialValue = value instanceof GValue ? new ConstantSupplier<>(((GValue) value).get()) : new ConstantSupplier<>(value);
+        strategy.sideEffects.add(new Triplet<>(key, value instanceof Supplier ? (Supplier) value : initialValue, reducer));
     }
 
     public boolean contains(final String sideEffectKey) {
diff --git a/gremlin-language/src/main/antlr4/Gremlin.g4 b/gremlin-language/src/main/antlr4/Gremlin.g4
index b397764bee..1c78da563e 100644
--- a/gremlin-language/src/main/antlr4/Gremlin.g4
+++ b/gremlin-language/src/main/antlr4/Gremlin.g4
@@ -487,7 +487,7 @@ traversalMethod_fold
     ;
 
 traversalMethod_from
-    : 'from' LPAREN stringArgument RPAREN #traversalMethod_from_String
+    : 'from' LPAREN stringLiteral RPAREN #traversalMethod_from_String
     | 'from' LPAREN structureVertexArgument RPAREN #traversalMethod_from_Vertex
     | 'from' LPAREN nestedTraversal RPAREN #traversalMethod_from_Traversal
     ;
@@ -644,7 +644,6 @@ traversalMethod_option
     : 'option' LPAREN traversalPredicate COMMA nestedTraversal RPAREN #traversalMethod_option_Predicate_Traversal
     | 'option' LPAREN traversalMergeArgument COMMA genericLiteralMapNullableArgument RPAREN #traversalMethod_option_Merge_Map
     | 'option' LPAREN traversalMergeArgument COMMA genericLiteralMapNullableArgument COMMA traversalCardinality RPAREN #traversalMethod_option_Merge_Map_Cardinality
-    | 'option' LPAREN traversalMergeArgument COMMA nestedTraversal RPAREN #traversalMethod_option_Merge_Traversal
     | 'option' LPAREN genericLiteralArgument COMMA nestedTraversal RPAREN #traversalMethod_option_Object_Traversal
     | 'option' LPAREN nestedTraversal RPAREN #traversalMethod_option_Traversal
     ;
@@ -808,8 +807,8 @@ traversalMethod_times
     ;
 
 traversalMethod_to
-    : 'to' LPAREN traversalDirectionArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_to_Direction_String
-    | 'to' LPAREN stringArgument RPAREN #traversalMethod_to_String
+    : 'to' LPAREN traversalDirection (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_to_Direction_String
+    | 'to' LPAREN stringLiteral RPAREN #traversalMethod_to_String
     | 'to' LPAREN structureVertexArgument RPAREN #traversalMethod_to_Vertex
     | 'to' LPAREN nestedTraversal RPAREN #traversalMethod_to_Traversal
     ;
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
index 180c584bc0..a282f69759 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
@@ -63,6 +63,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -183,13 +184,13 @@ public final class StepDefinition {
             }
         }));
 
-        add(Pair.with(Pattern.compile("l\\[\\]"), s -> Collections.emptyList()));
+        add(Pair.with(Pattern.compile("l\\[\\]"), s -> new ArrayList<>()));
         add(Pair.with(Pattern.compile("l\\[(.*)\\]"), s -> {
             final String[] items = s.split(",");
             return Stream.of(items).map(String::trim).map(x -> convertToObject(x)).collect(Collectors.toList());
         }));
 
-        add(Pair.with(Pattern.compile("s\\[\\]"), s -> Collections.emptySet()));
+        add(Pair.with(Pattern.compile("s\\[\\]"), s -> new HashSet<>()));
         add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
             final String[] items = s.split(",");
             return Stream.of(items).map(String::trim).map(x -> convertToObject(x)).collect(Collectors.toSet());
@@ -235,7 +236,7 @@ public final class StepDefinition {
         add(Pair.with(Pattern.compile("e\\[(.+)\\]"), s -> getEdge(g, s)));
 
         add(Pair.with(Pattern.compile("t\\[(.*)\\]"), T::valueOf));
-        add(Pair.with(Pattern.compile("D\\[(.*)\\]"), Direction::valueOf));
+        add(Pair.with(Pattern.compile("D\\[(.*)\\]"), StepDefinition::getDirection));
         add(Pair.with(Pattern.compile("M\\[(.*)\\]"), Merge::valueOf));
 
         add(Pair.with(Pattern.compile("c\\[(.*)\\]"), s -> {
@@ -383,10 +384,11 @@ public final class StepDefinition {
     }
 
     @Then("the graph should return {int} for count of {string}")
-    public void theGraphShouldReturnForCountOf(final Integer count, final String gremlin) {
+    public void theGraphShouldReturnForCountOf(final Integer count, final String rawGremlin) {
         assertThatNoErrorWasThrown();
 
-        assertEquals(count.longValue(), ((GraphTraversal) parseGremlin(applyParameters(gremlin))).count().next());
+        final String gremlin = world.useParametersLiterally() ? applyParameters(rawGremlin) : rawGremlin;
+        assertEquals(count.longValue(), ((GraphTraversal) parseGremlin(gremlin)).count().next());
     }
 
     @Then("the result should be empty")
@@ -602,6 +604,12 @@ public final class StepDefinition {
         return docString.replace(relPath, escapeJava(absPath));
     }
 
+    private static Direction getDirection(final String direction) {
+        if (direction.equals("from")) return Direction.OUT;
+        if (direction.equals("to")) return Direction.IN;
+        return Direction.valueOf(direction);
+    }
+
     /**
      * TinkerPop version of Hamcrest's {code containsInAnyOrder} that can use our custom assertions for {@link Path}.
      */


(tinkerpop) 08/20: wip - add values getter on inject

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 96434deab73868bb4107251f12456885ae96b8d7
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 22 14:02:19 2024 -0400

    wip - add values getter on inject
---
 .../gremlin/process/traversal/step/sideEffect/InjectStep.java      | 7 +++++++
 .../gremlin/sparql/process/traversal/strategy/SparqlStrategy.java  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index cc3a970f93..4102cfdd57 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -55,4 +55,11 @@ public final class InjectStep<S> extends StartStep<S> {
     public GValue<S>[] getInjections() {
         return this.injections;
     }
+
+    /**
+     * Gets the injections of the step but unwraps the {@link GValue}.
+     */
+    public S[] getInjectionsAsValues() {
+        return (S[]) resolveToValues(this.injections);
+    }
 }
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index a4a95cc1c1..f4938fb219 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -71,7 +71,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
         // assumes that the traversal starts with the single inject step that holds the sparql query
         if (traversal.getStartStep() instanceof InjectStep) {
             final InjectStep stepWithSparql = (InjectStep) traversal.getStartStep();
-            final Object[] injections = stepWithSparql.getInjections();
+            final Object[] injections = stepWithSparql.getInjectionsAsValues();
 
             // further assumes that there is just one argument to that injection which is a string (i.e. sparql query)
             if (injections.length == 1 && injections[0] instanceof String) {


(tinkerpop) 07/20: wip - refactoring around mu steps

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d9fe6703469a99fa80a2bc8218a59d27b7bd2a86
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 22 13:27:02 2024 -0400

    wip - refactoring around mu steps
---
 .../language/grammar/TraversalMethodVisitor.java   | 28 ++++-----
 .../grammar/TraversalSourceSpawnMethodVisitor.java |  8 +--
 .../gremlin/process/traversal/step/GValue.java     | 23 +++++++-
 .../process/traversal/step/map/AddEdgeStep.java    |  8 +--
 .../gremlin/process/traversal/step/GValueTest.java | 66 +++++++++++++++++++++-
 5 files changed, 104 insertions(+), 29 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index 9878b96a9a..b9cb2e5642 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -93,7 +93,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public GraphTraversal visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return graphTraversal.mergeV((GValue<Map<Object, Object>>) literalOrVar);
         else
             return graphTraversal.mergeV((Map) literalOrVar);
@@ -129,7 +129,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public GraphTraversal visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return graphTraversal.mergeE((GValue<Map<Object, Object>>) literalOrVar);
         else
             return graphTraversal.mergeE((Map) literalOrVar);
@@ -456,12 +456,10 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public GraphTraversal visitTraversalMethod_coin(final GremlinParser.TraversalMethod_coinContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitFloatArgument(ctx.floatArgument());
-        if (literalOrVar instanceof Number)
-            return graphTraversal.coin(((Number) literalOrVar).doubleValue());
-        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType().isNumeric())
+        if (GValue.valueInstanceOfNumeric(literalOrVar))
             return graphTraversal.coin((GValue<Double>) literalOrVar);
         else
-            throw new IllegalArgumentException("coin argument must be a double");
+            return graphTraversal.coin(((Number) literalOrVar).doubleValue());
 
     }
 
@@ -657,12 +655,10 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public Traversal visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
-        if (literalOrVar instanceof Vertex)
-            return graphTraversal.from((Vertex) literalOrVar);
-        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.VERTEX)
+        if (GValue.valueInstanceOf(literalOrVar, GType.VERTEX))
             return graphTraversal.from((GValue<Vertex>) literalOrVar);
         else
-            throw new IllegalArgumentException("from argument must be a vertex");
+            return graphTraversal.from((Vertex) literalOrVar);
     }
 
     /**
@@ -1197,7 +1193,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public GraphTraversal visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (GValue<Map>) literalOrVar);
         else
             return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (Map) literalOrVar);
@@ -1695,12 +1691,10 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public Traversal visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
-        if (literalOrVar instanceof Vertex)
-            return graphTraversal.to((Vertex) literalOrVar);
-        else if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.VERTEX)
+        if (GValue.valueInstanceOf(literalOrVar, GType.VERTEX))
             return graphTraversal.to((GValue<Vertex>) literalOrVar);
         else
-            throw new IllegalArgumentException("from argument must be a vertex");
+            return graphTraversal.to((Vertex) literalOrVar);
     }
 
     /**
@@ -1861,7 +1855,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public Traversal visitTraversalMethod_call_string_map(final GremlinParser.TraversalMethod_call_string_mapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
         else
             return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar);
@@ -1882,7 +1876,7 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public Traversal visitTraversalMethod_call_string_map_traversal(final GremlinParser.TraversalMethod_call_string_map_traversalContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
         else
             return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar, antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
index bedf28d487..2758ea429c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
@@ -122,7 +122,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return this.traversalSource.asAdmin().mergeV((GValue) literalOrVar);
         else
             return this.traversalSource.mergeV((Map) literalOrVar);
@@ -150,7 +150,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return this.traversalSource.asAdmin().mergeE((GValue) literalOrVar);
         else
             return this.traversalSource.mergeE((Map) literalOrVar);
@@ -178,7 +178,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map(final GremlinParser.TraversalSourceSpawnMethod_call_string_mapContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar);
         else
             return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar);
@@ -199,7 +199,7 @@ public class TraversalSourceSpawnMethodVisitor extends DefaultGremlinBaseVisitor
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map_traversal(final GremlinParser.TraversalSourceSpawnMethod_call_string_map_traversalContext ctx) {
         final Object literalOrVar = antlr.argumentVisitor.visitGenericLiteralMapArgument(ctx.genericLiteralMapArgument());
-        if (literalOrVar instanceof GValue && ((GValue) literalOrVar).getType() == GType.MAP)
+        if (GValue.valueInstanceOf(literalOrVar, GType.MAP))
             return this.traversalSource.asAdmin().call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (GValue<Map>) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
         else
             return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()), (Map) literalOrVar, anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index 6f5c6223f6..f7692d6866 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -332,6 +332,13 @@ public class GValue<V> implements Cloneable, Serializable {
         return new GValue<>(name, GType.PROPERTY, value);
     }
 
+    /**
+     * If the object is a {@code GValue} then get its value, otherwise return the object as-is.
+     */
+    public static <T> T getFrom(final Object o) {
+        return o instanceof GValue ? ((GValue<T>) o).get() : (T) o;
+    }
+
     /**
      * Tests if the object is a {@link GValue} and if so, checks the type of the value against the provided
      * {@link GType}.
@@ -340,6 +347,20 @@ public class GValue<V> implements Cloneable, Serializable {
         return o instanceof GValue && ((GValue) o).getType() == type;
     }
 
+    /**
+     * Tests if the object is a {@link GValue} and if so, checks if the type of the value is a collection.
+     */
+    public static boolean valueInstanceOfCollection(final Object o) {
+        return o instanceof GValue && ((GValue) o).getType().isCollection();
+    }
+
+    /**
+     * Tests if the object is a {@link GValue} and if so, checks if the type of the value is a numeric.
+     */
+    public static boolean valueInstanceOfNumeric(final Object o) {
+        return o instanceof GValue && ((GValue) o).getType().isNumeric();
+    }
+
     /**
      * Checks the type of the object against the provided {@link GType}. If the object is a {@link GValue} then it
      * can directly check the type, otherwise it will test the given object's class itself using the mappign on the
@@ -352,7 +373,7 @@ public class GValue<V> implements Cloneable, Serializable {
         else if (o instanceof GValue)
             return ((GValue) o).getType() == type;
         else
-            return o.getClass().isAssignableFrom(type.getJavaType());
+            return type.getJavaType().isAssignableFrom(o.getClass());
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
index 39c37bf9f5..db3f72cfe7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
@@ -114,7 +114,7 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theTo instanceof Vertex) || (theTo instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
+        if (!GValue.instanceOf(theTo, GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theTo ? "null" : theTo.getClass().getSimpleName()));
@@ -128,13 +128,13 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theFrom instanceof Vertex) || (theFrom instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
+        if (!GValue.instanceOf(theFrom, GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theFrom ? "null" : theFrom.getClass().getSimpleName()));
 
-        Vertex toVertex = theTo instanceof Vertex ? (Vertex) theTo : ((GValue<Vertex>) theTo).get();
-        Vertex fromVertex = theFrom instanceof Vertex ? (Vertex) theFrom : ((GValue<Vertex>) theFrom).get();
+        Vertex toVertex = GValue.getFrom(theTo);
+        Vertex fromVertex = GValue.getFrom(theFrom);
 
         if (toVertex instanceof Attachable)
             toVertex = ((Attachable<Vertex>) toVertex)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
index 07f3fe7f7e..f6aff53c8d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -394,14 +394,14 @@ public class GValueTest {
     }
 
     @Test
-    public void valueInstanceOfShouldReturnTrueForMatchingType() {
-        GValue<Integer> gValue = GValue.of(123);
+    public void ShouldHaveForMatchingType() {
+        final GValue<Integer> gValue = GValue.of(123);
         assertThat(GValue.valueInstanceOf(gValue, GType.INTEGER), is(true));
     }
 
     @Test
     public void valueInstanceOfShouldReturnFalseForNonMatchingType() {
-        GValue<Integer> gValue = GValue.of(123);
+        final GValue<Integer> gValue = GValue.of(123);
         assertThat(GValue.valueInstanceOf(gValue, GType.STRING), is(false));
     }
 
@@ -415,4 +415,64 @@ public class GValueTest {
     public void valueInstanceOfShouldReturnFalseForNullObject() {
         assertThat(GValue.valueInstanceOf(null, GType.STRING), is(false));
     }
+
+    @Test
+    public void getShouldReturnGValueValue() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertThat(GValue.getFrom(gValue), is(123));
+    }
+
+    @Test
+    public void getShouldReturnObjectAsIs() {
+        final String value = "test";
+        assertThat(GValue.getFrom(value), is(value));
+    }
+
+    @Test
+    public void getShouldReturnNullForNullInput() {
+        assertThat(GValue.getFrom(null), is((Object) null));
+    }
+
+    @Test
+    public void valueInstanceOfCollectionShouldReturnTrueForGValueWithCollectionType() {
+        final GValue<List<String>> gValue = GValue.ofList(Arrays.asList("value1", "value2"));
+        assertThat(GValue.valueInstanceOfCollection(gValue), is(true));
+    }
+
+    @Test
+    public void valueInstanceOfCollectionShouldReturnFalseForGValueWithNonCollectionType() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertThat(GValue.valueInstanceOfCollection(gValue), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfCollectionShouldReturnFalseForNonGValueObject() {
+        assertThat(GValue.valueInstanceOfCollection("test"), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfCollectionShouldReturnFalseForNullObject() {
+        assertThat(GValue.valueInstanceOfCollection(null), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfNumericShouldReturnTrueForGValueWithNumericType() {
+        final GValue<Integer> gValue = GValue.of(123);
+        assertThat(GValue.valueInstanceOfNumeric(gValue), is(true));
+    }
+
+    @Test
+    public void valueInstanceOfNumericShouldReturnFalseForGValueWithNonNumericType() {
+        assertThat(GValue.valueInstanceOfNumeric("test"), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfNumericShouldReturnFalseForNonGValueObject() {
+        assertThat(GValue.valueInstanceOfNumeric("test"), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfNumericShouldReturnFalseForNullObject() {
+        assertThat(GValue.valueInstanceOfNumeric(null), is(false));
+    }
 }
\ No newline at end of file


(tinkerpop) 05/20: wip

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 211855134c7dc56a6e00887258b863984e5ed65d
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 8 16:24:37 2024 -0400

    wip
---
 .../tinkerpop/gremlin/process/traversal/P.java       | 20 +++++++++++++++++---
 .../process/traversal/dsl/graph/GraphTraversal.java  |  7 +++++++
 .../gremlin/process/traversal/step/GValue.java       |  4 ++--
 .../process/traversal/step/map/GraphStep.java        | 13 +++++++++++++
 .../process/traversal/step/util/AbstractStep.java    | 19 ++++++++++++++++++-
 .../process/traversal/step/util/HasContainer.java    |  6 ++++--
 .../gremlin/process/traversal/step/GValueTest.java   |  4 ++--
 .../traversal/step/sideEffect/TinkerGraphStep.java   | 14 ++++++++------
 8 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 56e1946368..622a3c3e3a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -25,7 +25,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * Predefined {@code Predicate} values that can be used to define filters to {@code has()} and {@code where()}.
@@ -75,10 +77,22 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
 
     @Override
     public boolean test(final V testValue) {
-        if (this.value instanceof GValue)
+        if (this.value instanceof GValue) {
             return this.biPredicate.test(testValue, ((GValue<V>) this.value).get());
-        else
-            return this.biPredicate.test(testValue, this.value);
+        } else {
+            // this might be a bunch of GValue that need to be resolved. zomg
+            if (this.value instanceof List) {
+                return this.biPredicate.test(testValue, (V) ((List) this.value).stream().map(o -> {
+                    if (o instanceof GValue) {
+                        return ((GValue) o).get();
+                    } else {
+                        return o;
+                    }
+                }).collect(Collectors.toList()));
+            } else {
+                return this.biPredicate.test(testValue, this.value);
+            }
+        }
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 506d757d7c..fed7899485 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRank
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ProgramVertexProgramStep;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ShortestPathVertexProgramStep;
+import org.apache.tinkerpop.gremlin.process.traversal.Contains;
 import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.Failure;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
@@ -2830,6 +2831,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         } else {
             this.asAdmin().getGremlinLang().addStep(Symbols.hasId, id, otherIds);
 
+            // the logic for dealing with hasId([]) is sketchy historically, just trying to maintain what we were
+            // originally testing prior to GValue.
+            if (id instanceof GValue && ((GValue) id).getType().isCollection()) {
+                return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.id.getAccessor(), new P(Contains.within, id)));
+            }
+
             //using ArrayList given P.within() turns all arguments into lists
             final List<Object> ids = new ArrayList<>();
             if (id instanceof Object[]) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index 41caaea1a2..da0694acdc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -246,14 +246,14 @@ public class GValue<V> implements Cloneable, Serializable {
     /**
      * Create a new {@code GValue} for a list value.
      */
-    public static GValue<List> ofList(final List value) {
+    public static <T> GValue<List<T>> ofList(final List<T> value) {
         return new GValue<>(GType.LIST, value);
     }
 
     /**
      * Create a new {@code GValue} for a list value with a specified name.
      */
-    public static GValue<List> ofList(final String name, final List value) {
+    public static <T> GValue<List<T>> ofList(final String name, final List<T> value) {
         return new GValue<>(name, GType.LIST, value);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index 5c03500d6e..784ef087f3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -43,6 +43,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -56,6 +57,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
     protected Parameters parameters = new Parameters();
     protected final Class<E> returnClass;
     protected GValue<?>[] ids;
+    protected boolean legacyLogicForPassingNoIds = false;
     protected transient Supplier<Iterator<E>> iteratorSupplier;
     protected boolean isStart;
     protected boolean done = false;
@@ -152,10 +154,21 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
      * Gets the ids associated with this step as literal values rather than {@link GValue} objects.
      */
     public Object[] getResolvedIds() {
+        if (legacyLogicForPassingNoIds) return null;
         return resolveToValues(this.ids);
     }
 
     public void addIds(final Object... newIds) {
+        // there is some logic that has been around for a long time that used to set ids to null. it only happened here
+        // in this method and only occurred when the ids were already null or empty and the newIds were length 1 and
+        // an instance of List and that list was empty. so basically it would trigger for something like g.V().hasId([])
+        // which in turn would trigger an empty iterator in TinkerGraphStep and zero results. trying to maintain that
+        // logic now with GValue in the mix is tough because the context of what the meaning is gets lost by the time
+        // you get to calling getResolvedIds(). using a flag to try to maintain that legacy logic, but ultimately, all
+        // this needs to be rethought.
+        this.legacyLogicForPassingNoIds = newIds.length == 1 && ((newIds[0] instanceof List && ((List) newIds[0]).isEmpty()) ||
+                (newIds[0] instanceof GValue && ((GValue) newIds[0]).getType().isCollection() && ((List) ((GValue) newIds[0]).get()).isEmpty()));
+
         final GValue[] gvalues = convertToGValues(tryUnrollSingleCollectionArgument(newIds));
         this.ids = ArrayUtils.addAll(this.ids, gvalues);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
index 15ddacdc91..dd6f5fb849 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
@@ -28,9 +28,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
@@ -245,7 +247,22 @@ public abstract class AbstractStep<S, E> implements Step<S, E> {
     }
 
     /**
-     * Converts {@link GValue} objects the argument array to their values to prevent them from leaking to the Graph API.
+     * Converts {@link GValue} objects arguments to their values to prevent them from leaking to the Graph API.
+     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
+     * objects from leaking to the Graph API.
+     */
+    protected Object[] resolveToValues(final List<GValue<?>> gvalues) {
+        // convert gvalues to array
+        final Object[] newIds = new Object[gvalues.size()];
+        int i = 0;
+        for (final GValue<?> gvalue : gvalues) {
+            newIds[i++] = gvalue.get();
+        }
+        return newIds;
+    }
+
+    /**
+     * Converts {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
      * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
      * objects from leaking to the Graph API.
      */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
index c20c68fde0..d456b09df6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
@@ -19,10 +19,12 @@
 package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 
 import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GType;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -154,11 +156,11 @@ public class HasContainer implements Serializable, Cloneable, Predicate<Element>
             if (predicateValue instanceof Collection) {
                 final Collection collection = (Collection) predicateValue;
                 if (!collection.isEmpty()) {
-                    return ((Collection) predicateValue).stream().allMatch(c -> null == c || c instanceof String);
+                    return ((Collection) predicateValue).stream().allMatch(c -> null == c || c instanceof String || (c instanceof GValue && ((GValue) c).getType() == GType.STRING));
                 }
             }
 
-            return predicateValue instanceof String;
+            return predicateValue instanceof String || (predicateValue instanceof GValue && ((GValue) predicateValue).getType() == GType.STRING);
         }
 
         return false;
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
index d1742e3e29..f4ae56dff8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -203,7 +203,7 @@ public class GValueTest {
     @Test
     public void shouldCreateGValueFromList() {
         final List<String> list = Arrays.asList("value1", "value2");
-        final GValue<List> gValue = GValue.ofList(list);
+        final GValue<List<String>> gValue = GValue.ofList(list);
         assertEquals(list, gValue.get());
         assertEquals(GType.LIST, gValue.getType());
         assertThat(gValue.isVariable(), is(false));
@@ -212,7 +212,7 @@ public class GValueTest {
     @Test
     public void shouldCreateGValueFromListWithName() {
         final List<String> list = Arrays.asList("value1", "value2");
-        final GValue<List> gValue = GValue.ofList("varName", list);
+        final GValue<List<String>> gValue = GValue.ofList("varName", list);
         assertEquals(list, gValue.get());
         assertEquals(GType.LIST, gValue.getType());
         assertEquals("varName", gValue.getName());
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
index e529d78390..9715c0e4e4 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
@@ -71,11 +71,12 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Edge.class);
         Iterator<Edge> iterator;
+        final Object[] resolvedIds = this.getResolvedIds();
         // ids are present, filter on them first
-        if (null == this.ids)
+        if (null == resolvedIds)
             iterator = Collections.emptyIterator();
-        else if (this.ids.length > 0)
-            iterator = this.iteratorList(graph.edges(this.getResolvedIds()));
+        else if (resolvedIds.length > 0)
+            iterator = this.iteratorList(graph.edges(resolvedIds));
         else
             iterator = null == indexedContainer ?
                     this.iteratorList(graph.edges()) :
@@ -93,11 +94,12 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Vertex.class);
         Iterator<? extends Vertex> iterator;
+        final Object[] resolvedIds = this.getResolvedIds();
         // ids are present, filter on them first
-        if (null == this.ids)
+        if (null == resolvedIds)
             iterator = Collections.emptyIterator();
-        else if (this.ids.length > 0)
-            iterator = this.iteratorList(graph.vertices(this.getResolvedIds()));
+        else if (resolvedIds.length > 0)
+            iterator = this.iteratorList(graph.vertices(resolvedIds));
         else
             iterator = (null == indexedContainer ?
                     this.iteratorList(graph.vertices()) :


(tinkerpop) 06/20: wip - hasLabel(String, String...) fixes, more GValue utility

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 19c5552dc60e911c5f89003852f9e48f5cc34abb
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Aug 21 15:35:01 2024 -0400

    wip - hasLabel(String, String...) fixes, more GValue utility
---
 .../language/grammar/GenericLiteralVisitor.java    |  14 +++
 .../language/grammar/TraversalMethodVisitor.java   |  27 +++++-
 .../translator/DotNetTranslateVisitor.java         |   2 +-
 .../traversal/dsl/graph/GraphTraversal.java        |   2 +-
 .../gremlin/process/traversal/step/GType.java      |  40 ++++----
 .../gremlin/process/traversal/step/GValue.java     |  55 ++++++++++-
 .../process/traversal/step/map/AddEdgeStep.java    |   4 +-
 .../process/traversal/step/map/GraphStep.java      |   4 +-
 .../strategy/decoration/ElementIdStrategy.java     |   7 +-
 .../language/translator/GremlinTranslatorTest.java |   9 ++
 .../gremlin/process/traversal/step/GValueTest.java | 102 +++++++++++++++++++++
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  11 ++-
 gremlin-go/driver/cucumber/gremlin.go              |   3 +-
 .../gremlin-javascript/test/cucumber/gremlin.js    |   3 +-
 gremlin-python/src/main/python/radish/gremlin.py   |   3 +-
 .../gremlin/test/features/map/Conjoin.feature      |   4 +-
 .../traversal/step/sideEffect/Neo4jGraphStep.java  |   4 +-
 .../traversal/step/sideEffect/TinkerGraphStep.java |   4 +-
 18 files changed, 253 insertions(+), 45 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
index ced6c832d1..fb124ec910 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
@@ -658,4 +658,18 @@ public class GenericLiteralVisitor extends DefaultGremlinBaseVisitor<Object> {
         else
             return StringEscapeUtils.unescapeJava(stripQuotes(ctx.getText()));
     }
+
+    @Override
+    public Object[] visitStringLiteralVarargs(final GremlinParser.StringLiteralVarargsContext ctx) {
+        if (ctx == null) {
+            return new Object[0];
+        }
+        return ctx.children
+                .stream()
+                .filter(Objects::nonNull)
+                .filter(p -> p instanceof GremlinParser.StringNullableArgumentContext)
+                .map(p -> (GremlinParser.StringNullableArgumentContext) p)
+                .map(antlr.argumentVisitor::visitStringNullableArgument)
+                .toArray(Object[]::new);
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index daf72820d4..9878b96a9a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.function.BiFunction;
 
@@ -756,10 +757,30 @@ public class TraversalMethodVisitor extends TraversalRootVisitor<GraphTraversal>
     @Override
     public GraphTraversal visitTraversalMethod_hasLabel_String_String(final GremlinParser.TraversalMethod_hasLabel_String_StringContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.hasLabel(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
+            final Object literalOrVar = antlr.argumentVisitor.visitStringNullableArgument(ctx.stringNullableArgument());
+            if (GValue.valueInstanceOf(literalOrVar, GType.STRING))
+                return graphTraversal.hasLabel((GValue) literalOrVar);
+            else
+                return graphTraversal.hasLabel((String) literalOrVar);
         } else {
-            return graphTraversal.hasLabel(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
-                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
+            Object literalOrVar = antlr.argumentVisitor.visitStringNullableArgument(ctx.stringNullableArgument());
+            Object[] literalOrVars = antlr.genericVisitor.visitStringLiteralVarargs(ctx.stringLiteralVarargs());
+
+            // if any are GValue then they all need to be GValue to call hasLabel
+            if (literalOrVar instanceof GValue || Arrays.stream(literalOrVars).anyMatch(lov -> lov instanceof GValue)) {
+                literalOrVar = GValue.of(literalOrVar);
+                literalOrVars = Arrays.stream(literalOrVars).map(GValue::of).toArray();
+            }
+
+            // since we normalized above to gvalue or literal we can just test the first arg for gvalue-ness
+            if (GValue.valueInstanceOf(literalOrVar, GType.STRING)) {
+                final GValue[] gvalueLiteralOrVars = literalOrVars == null ? null : Arrays.stream(literalOrVars).map(o -> (GValue) o).toArray(GValue[]::new);
+                return graphTraversal.hasLabel((GValue) literalOrVar, (GValue[]) literalOrVars);
+            } else {
+                // convert object array to string array
+                final String[] stringLiteralOrVars = literalOrVars == null ? null : Arrays.stream(literalOrVars).map(o -> (String) o).toArray(String[]::new);
+                return graphTraversal.hasLabel((String) literalOrVar, stringLiteralOrVars);
+            }
         }
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
index 717fc536cb..7ab9819c2c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java
@@ -879,7 +879,7 @@ public class DotNetTranslateVisitor extends AbstractTranslateVisitor {
 
     @Override
     public Void visitTraversalMethod_option_Object_Traversal(final GremlinParser.TraversalMethod_option_Object_TraversalContext ctx) {
-        if (ctx.genericLiteralArgument().genericLiteral().traversalMerge() != null) {
+        if (ctx.genericLiteralArgument().genericLiteral() != null && ctx.genericLiteralArgument().genericLiteral().traversalMerge() != null) {
             visit(ctx.getChild(0));
             sb.append("(");
             visit(ctx.genericLiteralArgument());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index fed7899485..375a9993b8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -447,7 +447,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
          * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step" target="_blank">Reference Documentation - Has Step</a>
          * @since 3.2.2
          */
-        public default GraphTraversal<S, E> hasLabel(final Object label, final Object... otherLabels) {
+        public default GraphTraversal<S, E> hasLabel(final GValue<String> label, final GValue<String>... otherLabels) {
             this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels);
 
             // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
index 58c1fdfe4d..4c8777d290 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GType.java
@@ -33,23 +33,31 @@ import java.util.Set;
  * An enum that describes types that are used in the Gremlin language.
  */
 public enum GType {
-    BIG_DECIMAL,
-    BIG_INTEGER,
-    BOOLEAN,
-    DOUBLE,
-    EDGE,
-    INTEGER,
-    LIST,
-    LONG,
-    MAP,
-    PATH,
-    PROPERTY,
-    SET,
-    STRING,
-    UNKNOWN,
-    VERTEX;
+    BIG_DECIMAL(BigDecimal.class),
+    BIG_INTEGER(BigInteger.class),
+    BOOLEAN(Boolean.class),
+    DOUBLE(Double.class),
+    EDGE(Edge.class),
+    INTEGER(Integer.class),
+    LIST(List.class),
+    LONG(Long.class),
+    MAP(Map.class),
+    PATH(Path.class),
+    PROPERTY(Property.class),
+    SET(Set.class),
+    STRING(String.class),
+    UNKNOWN(null),
+    VERTEX(Vertex.class);
 
-    GType() {}
+    private Class<?> javaType;
+
+    GType(final Class<?> javaType) {
+        this.javaType = javaType;
+    }
+
+    public Class<?> getJavaType() {
+        return this.javaType;
+    }
 
     /**
      * Returns {@code true} if the type is a number.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
index da0694acdc..6f5c6223f6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java
@@ -21,16 +21,17 @@ package org.apache.tinkerpop.gremlin.process.traversal.step;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -113,21 +114,25 @@ public class GValue<V> implements Cloneable, Serializable {
     }
 
     /**
-     * Create a new {@code Var} from a particular value but without the specified name.
+     * Create a new {@code Var} from a particular value but without the specified name. If the argument provide is
+     * already a {@code GValue} then it is returned as-is.
      *
      * @param value the value of the variable
      */
     public static <V> GValue<V> of(final V value) {
+        if (value instanceof GValue) return (GValue) value;
         return new GValue<>(GType.getType(value), value);
     }
 
     /**
-     * Create a new {@code Var} with the specified name and value.
+     * Create a new {@code Var} with the specified name and value.. If the argument provide is  already a
+     * {@code GValue} then it is returned as-is.
      *
      * @param name the name of the variable
      * @param value the value of the variable
      */
     public static <V> GValue<V> of(final String name, final V value) {
+        if (value instanceof GValue) throw new IllegalArgumentException("value cannot be a GValue");
         return new GValue<>(name, GType.getType(value), value);
     }
 
@@ -326,4 +331,48 @@ public class GValue<V> implements Cloneable, Serializable {
     public static GValue<Property> ofProperty(final String name, final Property value) {
         return new GValue<>(name, GType.PROPERTY, value);
     }
+
+    /**
+     * Tests if the object is a {@link GValue} and if so, checks the type of the value against the provided
+     * {@link GType}.
+     */
+    public static boolean valueInstanceOf(final Object o, final GType type) {
+        return o instanceof GValue && ((GValue) o).getType() == type;
+    }
+
+    /**
+     * Checks the type of the object against the provided {@link GType}. If the object is a {@link GValue} then it
+     * can directly check the type, otherwise it will test the given object's class itself using the mappign on the
+     * {@link GType}.
+     */
+    public static boolean instanceOf(final Object o, final GType type) {
+        // todo: is this right for null?
+        if (null == o)
+            return false;
+        else if (o instanceof GValue)
+            return ((GValue) o).getType() == type;
+        else
+            return o.getClass().isAssignableFrom(type.getJavaType());
+    }
+
+    /**
+     * Returns {@code true} if the object is a collection or a {@link GValue} that contains a {@link Collection}.
+     */
+    public static boolean instanceOfCollection(final Object o) {
+        return o instanceof Collection || (o instanceof GValue && ((GValue) o).getType().isCollection());
+    }
+
+    /**
+     * Returns {@code true} if the object is an element or a {@link GValue} that contains an {@link Element}.
+     */
+    public static boolean instanceOfElement(final Object o) {
+        return o instanceof Element || (o instanceof GValue && ((GValue) o).getType().isElement());
+    }
+
+    /**
+     * Returns {@code true} if the object is a number or a {@link GValue} that contains a number.
+     */
+    public static boolean instanceOfNumber(final Object o) {
+        return o instanceof Number || (o instanceof GValue && ((GValue) o).getType().isNumeric());
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
index 82c7f3893b..39c37bf9f5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
@@ -114,7 +114,7 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theTo instanceof Vertex) && (theTo instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
+        if (!(theTo instanceof Vertex) || (theTo instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theTo ? "null" : theTo.getClass().getSimpleName()));
@@ -128,7 +128,7 @@ public class AddEdgeStep<S> extends ScalarMapStep<S, Edge>
                     edgeLabel, e.getMessage()));
         }
 
-        if (!(theFrom instanceof Vertex) && (theFrom instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
+        if (!(theFrom instanceof Vertex) || (theFrom instanceof GValue && ((GValue) theTo).getType() != GType.VERTEX))
             throw new IllegalStateException(String.format(
                     "The value given to addE(%s).to() must resolve to a Vertex but %s was specified instead", edgeLabel,
                     null == theFrom ? "null" : theFrom.getClass().getSimpleName()));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index 784ef087f3..0a4635240a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -144,7 +144,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
 
     /**
      * Get the ids associated with this step. If there are {@link GValue} objects present they will be returned
-     * alongside literal ids. Prefer {@link #getResolvedIds()} if you prefer to work with literal ids only.
+     * alongside literal ids. Prefer {@link #getIdsAsValues()} if you prefer to work with literal ids only.
      */
     public GValue[] getIds() {
         return this.ids;
@@ -153,7 +153,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen
     /**
      * Gets the ids associated with this step as literal values rather than {@link GValue} objects.
      */
-    public Object[] getResolvedIds() {
+    public Object[] getIdsAsValues() {
         if (legacyLogicForPassingNoIds) return null;
         return resolveToValues(this.ids);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
index 67c08254a8..e47b782185 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategy.java
@@ -94,11 +94,12 @@ public final class ElementIdStrategy extends AbstractTraversalStrategy<Traversal
             // note that it is then only necessary to replace the step if the id is a non-element.  other tests
             // in the suite validate that items in getIds() is uniform so it is ok to just test the first item
             // in the list.
-            if (graphStep.getIds().length > 0 && !(graphStep.getIds()[0] instanceof Element)) {
+            final Object[] ids = graphStep.getIdsAsValues();
+            if (ids.length > 0 && !(ids[0] instanceof Element)) {
                 if (graphStep instanceof HasContainerHolder)
-                    ((HasContainerHolder) graphStep).addHasContainer(new HasContainer(this.idPropertyKey, P.within(Arrays.asList(graphStep.getIds()))));
+                    ((HasContainerHolder) graphStep).addHasContainer(new HasContainer(this.idPropertyKey, P.within(Arrays.asList(ids))));
                 else
-                    TraversalHelper.insertAfterStep(new HasStep(traversal, new HasContainer(this.idPropertyKey, P.within(Arrays.asList(graphStep.getIds())))), graphStep, traversal);
+                    TraversalHelper.insertAfterStep(new HasStep(traversal, new HasContainer(this.idPropertyKey, P.within(Arrays.asList(ids)))), graphStep, traversal);
                 graphStep.clearIds();
             }
         }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
index 90022b34d5..7c920f2613 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java
@@ -1063,6 +1063,15 @@ public class GremlinTranslatorTest {
                             "g.mergeV(new LinkedHashMap<Object, Object>() {{ put(\"name\", \"alice\"); put(T.label, \"person\"); }}).option(Merge.onCreate, new LinkedHashMap<Object, Object>() {{ put(\"age\", Cardinality.single(81)); }})",
                             "g.mergeV(new Map([[\"name\", \"alice\"], [T.label, \"person\"]])).option(Merge.onCreate, new Map([[\"age\", CardinalityValue.single(81)]]))",
                             "g.merge_v({ 'name': 'alice', T.label: 'person' }).option(Merge.on_create, { 'age': CardinalityValue.single(81) })"},
+                    {"g.V().branch(__.label().is(\"person\").count()).option(xx1, __.values(\"age\")).option(xx2, __.values(\"lang\")).option(xx2, __.values(\"name\")).option(Pick.any, __.label())",
+                            null,
+                            "g.V().branch(__.label().is(string0).count()).option(xx1, __.values(string1)).option(xx2, __.values(string2)).option(xx2, __.values(string3)).option(Pick.any, __.label())",
+                            "g.V().Branch<object>(__.Label().Is(\"person\").Count()).Option(xx1, __.Values<object>(\"age\")).Option(xx2, __.Values<object>(\"lang\")).Option(xx2, __.Values<object>(\"name\")).Option(Pick.Any, __.Label())",
+                            "g.V().Branch(gremlingo.T__.Label().Is(\"person\").Count()).Option(xx1, gremlingo.T__.Values(\"age\")).Option(xx2, gremlingo.T__.Values(\"lang\")).Option(xx2, gremlingo.T__.Values(\"name\")).Option(gremlingo.Pick.Any, gremlingo.T__.Label())",
+                            null,
+                            null,
+                            null,
+                            "g.V().branch(__.label().is_('person').count()).option(xx1, __.values('age')).option(xx2, __.values('lang')).option(xx2, __.values('name')).option(Pick.any_, __.label())"},
                     {"g.V().toList()",
                             null,
                             null,
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
index f4ae56dff8..07f3fe7f7e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueTest.java
@@ -37,10 +37,25 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
 
 public class GValueTest {
 
+    @Test
+    public void shouldReturnAnExistingGValue() {
+        final GValue<Integer> gValue = GValue.of(123);
+        final Object returnedGValue = GValue.of(gValue);
+        assertEquals(gValue, returnedGValue);
+        assertSame(gValue, returnedGValue);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldReturnAnExistInTypedGValue() {
+        final Object gValue = GValue.of("x", 123);
+        GValue.of("x", gValue);
+    }
+
     @Test
     public void shouldCreateGValueFromValue() {
         final GValue<Integer> gValue = GValue.of(123);
@@ -313,4 +328,91 @@ public class GValueTest {
         assertEquals("varName", gValue.getName());
         assertThat(gValue.isVariable(), is(true));
     }
+
+    @Test
+    public void shouldBeAnInstanceOf() {
+        assertThat(GValue.instanceOf(GValue.of("string"), GType.STRING), is(true));
+        assertThat(GValue.instanceOf(GValue.ofInteger(1), GType.INTEGER), is(true));
+        assertThat(GValue.instanceOf("string", GType.STRING), is(true));
+        assertThat(GValue.instanceOf(1, GType.INTEGER), is(true));
+    }
+
+    @Test
+    public void shouldNotBeAnInstanceOf() {
+        assertThat(GValue.instanceOf(GValue.of("string"), GType.INTEGER), is(false));
+        assertThat(GValue.instanceOf(GValue.ofInteger(1), GType.STRING), is(false));
+        assertThat(GValue.instanceOf("string", GType.INTEGER), is(false));
+        assertThat(GValue.instanceOf(1, GType.STRING), is(false));
+    }
+
+    @Test
+    public void shouldBeAnInstanceOfCollection() {
+        assertThat(GValue.instanceOfCollection(GValue.of(Arrays.asList("string"))), is(true));
+        assertThat(GValue.instanceOfCollection(GValue.ofSet(new HashSet(Arrays.asList("string")))), is(true));
+        assertThat(GValue.instanceOfCollection(Arrays.asList("string")), is(true));
+        assertThat(GValue.instanceOfCollection(new HashSet(Arrays.asList("string"))), is(true));
+    }
+
+    @Test
+    public void shouldNotBeAnInstanceOfCollection() {
+        assertThat(GValue.instanceOfCollection(GValue.of(new HashMap())), is(false));
+        assertThat(GValue.instanceOfCollection(GValue.ofInteger(1)), is(false));
+        assertThat(GValue.instanceOfCollection(new HashMap()), is(false));
+        assertThat(GValue.instanceOfCollection(1), is(false));
+    }
+
+    @Test
+    public void shouldBeAnInstanceOfNumber() {
+        assertThat(GValue.instanceOfNumber(GValue.of(1)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.of(1L)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.of(1D)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.of(BigInteger.valueOf((1L)))), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.of(BigDecimal.valueOf((1.0)))), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.ofInteger(1)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.ofLong(1L)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.ofDouble(1D)), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.ofBigInteger(BigInteger.valueOf((1L)))), is(true));
+        assertThat(GValue.instanceOfNumber(GValue.ofBigDecimal(BigDecimal.valueOf((1.0)))), is(true));
+    }
+
+    @Test
+    public void shouldNotBeAnInstanceOfNumber() {
+        assertThat(GValue.instanceOfNumber(GValue.of("string")), is(false));
+        assertThat(GValue.instanceOfNumber(GValue.of(Arrays.asList("string"))), is(false));
+    }
+
+    @Test
+    public void shouldBeAnInstanceOfElement() {
+        assertThat(GValue.instanceOfElement(GValue.ofVertex(mock(Vertex.class))), is(true));
+        assertThat(GValue.instanceOfElement(GValue.ofEdge(mock(Edge.class))), is(true));
+    }
+
+    @Test
+    public void shouldNotBeAnInstanceOfElement() {
+        assertThat(GValue.instanceOfElement(GValue.of("string")), is(false));
+        assertThat(GValue.instanceOfElement(GValue.of(Arrays.asList("string"))), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfShouldReturnTrueForMatchingType() {
+        GValue<Integer> gValue = GValue.of(123);
+        assertThat(GValue.valueInstanceOf(gValue, GType.INTEGER), is(true));
+    }
+
+    @Test
+    public void valueInstanceOfShouldReturnFalseForNonMatchingType() {
+        GValue<Integer> gValue = GValue.of(123);
+        assertThat(GValue.valueInstanceOf(gValue, GType.STRING), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfShouldReturnFalseForNonGValueObject() {
+        String nonGValue = "test";
+        assertThat(GValue.valueInstanceOf(nonGValue, GType.STRING), is(false));
+    }
+
+    @Test
+    public void valueInstanceOfShouldReturnFalseForNullObject() {
+        assertThat(GValue.valueInstanceOf(null, GType.STRING), is(false));
+    }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index 81c6b1fe26..f9388d42a0 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -63,17 +63,17 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
             new Dictionary<string, List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>>
             {
                {"g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>()},  // skipping as it contains a lambda
-               {"g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Branch<object>(__.Label().Is("person").Count()).Option(p["xx1"], (ITraversal) __.Values<object>("age")).Option(p["xx2"], (ITraversal) __.Values<object>("lang")).Option(p["xx2"], (ITraversal) __.Values<object>("name"))}}, 
-               {"g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX_optionXany__labelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Branch<object>(__.Label().Is("person").Count()).Option(p["xx1"], (ITraversal) __.Values<object>("age")).Option(p["xx2"], (ITraversal) __.Values<object>("lang")).Option(p["xx2"], (ITraversal) __.Values<object>("name")).Option(Pick.Any, __.Label())}}, 
+               {"g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Branch<object>(__.Label().Is("person").Count()).Option(p["xx1"], __.Values<object>("age")).Option(p["xx2"], __.Values<object>("lang")).Option(p["xx2"], __.Values<object>("name"))}}, 
+               {"g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX_optionXany__labelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Branch<object>(__.Label().Is("person").Count()).Option(p["xx1"], __.Values<object>("age")).Option(p["xx2"], __.Values<object>("lang")).Option(p["xx2"], __.Values<object>("name")).Option(Pick.Any, __.Label())}}, 
                {"g_V_branchXageX_optionXltX30X__youngX_optionXgtX30X__oldX_optionXnone__on_the_edgeX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Branch<object>(__.Values<object>("age")).Option(P.Lt(30), __.Constant<object>("young")).Option(P.Gt(30), __.Constant<object>("old")).Option(Pick.None, __.Constant<object>("on the edge"))}}, 
                {"g_V_branchXidentityX_optionXhasLabelXsoftwareX__inXcreatedX_name_order_foldX_optionXhasXname_vadasX__ageX_optionXneqX123X__bothE_countX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Branch<object>(__.Identity()).Option(__.HasLabel("software"), __.In("created").Values<object>("name").Order().Fold()).Option(__.Has("name", "vadas"), __.Values<object>("age")).Option(P.Neq(123), __.BothE().Count())}}, 
-               {"g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.Out().Count()).Option(p["xx1"], (ITraversal) __.Values<object>("name")).Option(p["xx2"], (ITraversal) __.Values<object>("age"))}}, 
+               {"g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.Out().Count()).Option(p["xx1"], __.Values<object>("name")).Option(p["xx2"], __.Values<object>("age"))}}, 
                {"g_V_chooseXlabel_eqXpersonX__outXknowsX__inXcreatedXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>()},  // skipping as it contains a lambda
                {"g_V_chooseXhasLabelXpersonX_and_outXcreatedX__outXknowsX__identityX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.HasLabel("person").And().Out("created"), __.Out("knows"), __.Identity()).Values<object>("name")}}, 
                {"g_V_chooseXlabelX_optionXblah__outXknowsXX_optionXbleep__outXcreatedXX_optionXnone__identityX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.Label()).Option("blah", __.Out("knows")).Option("bleep", __.Out("created")).Option(Pick.None, __.Identity()).Values<object>("name")}}, 
                {"g_V_chooseXoutXknowsX_count_isXgtX0XX__outXknowsXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.Out("knows").Count().Is(P.Gt(0)), __.Out("knows")).Values<object>("name")}}, 
                {"g_V_hasLabelXpersonX_asXp1X_chooseXoutEXknowsX__outXknowsXX_asXp2X_selectXp1_p2X_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").As("p1").Choose<object>(__.OutE("knows"), __.Out("knows")).As("p2").Select<object>("p1", "p2").By("name")}}, 
-               {"g_V_hasLabelXpersonX_chooseXageX__optionX27L__constantXyoungXX_optionXnone__constantXoldXX_groupCount", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Choose<object>(__.Values<object>("age")).Option(p["xx1"], (ITraversal) __.Constant<object>("young")).Option(Pick.None, __.Constant<object>("old")).GroupCount<object>()}}, 
+               {"g_V_hasLabelXpersonX_chooseXageX__optionX27L__constantXyoungXX_optionXnone__constantXoldXX_groupCount", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Choose<object>(__.Values<object>("age")).Option(p["xx1"], __.Constant<object>("young")).Option(Pick.None, __.Constant<object>("old")).GroupCount<object>()}}, 
                {"g_injectX1X_chooseXisX1X__constantX10Xfold__foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx2"]).Choose<object>(__.Is(p["xx2"]), __.Constant<object>(p["xx1"]).Fold(), __.Fold<object>())}}, 
                {"g_injectX2X_chooseXisX1X__constantX10Xfold__foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx3"]).Choose<object>(__.Is(p["xx2"]), __.Constant<object>(p["xx1"]).Fold(), __.Fold<object>())}}, 
                {"g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Local<object>(__.Properties<object>("location").Order().By(T.Value, Order.Asc).Range<object>(0, 2)).Value<object>()}}, 
@@ -707,7 +707,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
                {"g_V_valuesXnameX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Conjoin("1")}}, 
                {"g_V_valuesXnonexistantX_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Conjoin(";")}}, 
                {"g_V_valuesXnameX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().Conjoin("_")}}, 
-               {"g_V_valuesXageX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(";")}}, 
+               {"g_V_valuesXageX_order_fold_conjoinXsemicolonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(";")}}, 
+               {"g_V_valuesXageX_order_fold_conjoinXslashX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(p["xx1"])}}, 
                {"g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Conjoin("MARKO")}}, 
                {"g_injectXmarkoX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(p["xx1"]).Conjoin("-")}}, 
                {"g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object, object>("location").Select<object>(Column.Values).Unfold<object>().Order(Scope.Local).Conjoin("1")}}, 
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index dba9316ffb..55feb35dfe 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -677,7 +677,8 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_V_valuesXnameX_conjoinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Conjoin("1")}}, 
     "g_V_valuesXnonexistantX_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Conjoin(";")}}, 
     "g_V_valuesXnameX_order_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().Conjoin("_")}}, 
-    "g_V_valuesXageX_order_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().Fold().Conjoin(";")}}, 
+    "g_V_valuesXageX_order_fold_conjoinXsemicolonX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().Fold().Conjoin(";")}}, 
+    "g_V_valuesXageX_order_fold_conjoinXslashX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().Fold().Conjoin(p["xx1"])}}, 
     "g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Conjoin("MARKO")}}, 
     "g_injectXmarkoX_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Conjoin("-")}}, 
     "g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Order(gremlingo.Scope.Local).Conjoin("1")}}, 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index e140b5a3b0..b8e81d76da 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -694,7 +694,8 @@ const gremlins = {
     g_V_valuesXnameX_conjoinX1X: [function({g}) { return g.V().values("name").conjoin("1") }], 
     g_V_valuesXnonexistantX_fold_conjoinX_X: [function({g}) { return g.V().values("nonexistant").fold().conjoin(";") }], 
     g_V_valuesXnameX_order_fold_conjoinX_X: [function({g}) { return g.V().values("name").order().fold().conjoin("_") }], 
-    g_V_valuesXageX_order_fold_conjoinX_X: [function({g}) { return g.V().values("age").order().fold().conjoin(";") }], 
+    g_V_valuesXageX_order_fold_conjoinXsemicolonX: [function({g}) { return g.V().values("age").order().fold().conjoin(";") }], 
+    g_V_valuesXageX_order_fold_conjoinXslashX: [function({g, xx1}) { return g.V().values("age").order().fold().conjoin(xx1) }], 
     g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX: [function({g}) { return g.V().out().path().by(__.values("name").toUpper()).conjoin("MARKO") }], 
     g_injectXmarkoX_conjoinX_X: [function({g, xx1}) { return g.inject(xx1).conjoin("-") }], 
     g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X: [function({g}) { return g.V().valueMap("location").select(Column.values).unfold().order(Scope.local).conjoin("1") }], 
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 72aaefa200..5cddea94f5 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -676,7 +676,8 @@ world.gremlins = {
     'g_V_valuesXnameX_conjoinX1X': [(lambda g:g.V().values('name').conjoin('1'))], 
     'g_V_valuesXnonexistantX_fold_conjoinX_X': [(lambda g:g.V().values('nonexistant').fold().conjoin(';'))], 
     'g_V_valuesXnameX_order_fold_conjoinX_X': [(lambda g:g.V().values('name').order().fold().conjoin('_'))], 
-    'g_V_valuesXageX_order_fold_conjoinX_X': [(lambda g:g.V().values('age').order().fold().conjoin(';'))], 
+    'g_V_valuesXageX_order_fold_conjoinXsemicolonX': [(lambda g:g.V().values('age').order().fold().conjoin(';'))], 
+    'g_V_valuesXageX_order_fold_conjoinXslashX': [(lambda g, xx1=None:g.V().values('age').order().fold().conjoin(xx1))], 
     'g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX': [(lambda g:g.V().out().path().by(__.values('name').to_upper()).conjoin('MARKO'))], 
     'g_injectXmarkoX_conjoinX_X': [(lambda g, xx1=None:g.inject(xx1).conjoin('-'))], 
     'g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X': [(lambda g:g.V().value_map('location').select(Column.values).unfold().order(Scope.local).conjoin('1'))], 
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
index 4c9cdb483b..8f05f14f0d 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
@@ -59,7 +59,7 @@ Feature: Step - conjoin()
       | result |
       | josh_lop_marko_peter_ripple_vadas |
 
-  Scenario: g_V_valuesXageX_order_fold_conjoinX_X
+  Scenario: g_V_valuesXageX_order_fold_conjoinXsemicolonX
     Given the modern graph
     And the traversal of
       """
@@ -70,7 +70,7 @@ Feature: Step - conjoin()
       | result |
       | 27;29;32;35 |
 
-  Scenario: g_V_valuesXageX_order_fold_conjoinX_X
+  Scenario: g_V_valuesXageX_order_fold_conjoinXslashX
     Given the modern graph
     And using the parameter xx1 defined as "/"
     And the traversal of
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
index abd0a6b801..90d7327cc7 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
@@ -66,7 +66,7 @@ public final class Neo4jGraphStep<S, E extends Element> extends GraphStep<S, E>
     private Iterator<? extends Edge> edges() {
         if (null == this.ids)
             return Collections.emptyIterator();
-        return IteratorUtils.filter(this.getTraversal().getGraph().get().edges(this.getResolvedIds()), edge -> HasContainer.testAll(edge, this.hasContainers));
+        return IteratorUtils.filter(this.getTraversal().getGraph().get().edges(this.getIdsAsValues()), edge -> HasContainer.testAll(edge, this.hasContainers));
     }
 
     private Iterator<? extends Vertex> vertices() {
@@ -76,7 +76,7 @@ public final class Neo4jGraphStep<S, E extends Element> extends GraphStep<S, E>
 
         // ids are present, filter on them first
         if (ids.length > 0)
-            return IteratorUtils.filter(graph.vertices(this.getResolvedIds()), vertex -> HasContainer.testAll(vertex, hasContainers));
+            return IteratorUtils.filter(graph.vertices(this.getIdsAsValues()), vertex -> HasContainer.testAll(vertex, hasContainers));
         ////// do index lookups //////
         graph.tx().readWrite();
         // get a label being search on
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
index 9715c0e4e4..5a3d59e80b 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
@@ -71,7 +71,7 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Edge.class);
         Iterator<Edge> iterator;
-        final Object[] resolvedIds = this.getResolvedIds();
+        final Object[] resolvedIds = this.getIdsAsValues();
         // ids are present, filter on them first
         if (null == resolvedIds)
             iterator = Collections.emptyIterator();
@@ -94,7 +94,7 @@ public final class TinkerGraphStep<S, E extends Element> extends GraphStep<S, E>
         final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Vertex.class);
         Iterator<? extends Vertex> iterator;
-        final Object[] resolvedIds = this.getResolvedIds();
+        final Object[] resolvedIds = this.getIdsAsValues();
         // ids are present, filter on them first
         if (null == resolvedIds)
             iterator = Collections.emptyIterator();